[debian-devel:19195] Re: RFS: serverspec-runner/1.2.2-1

[Satoru KURASHIKI <lurdan@xxxxxxxxx>]

倉敷です。
ご確認ありがとうございます。

2016-09-02 20:24 GMT+09:00  <dai@debian.org>:
> On Thu, Sep 01, 2016 at 08:56:44PM +0900, Satoru KURASHIKI wrote:
>> # 開発元への追従のみですが、gem2deb をやりなおしています
>
> gem2deb やり直しで変更がかかった部分について記載してくださいませ。
> # gem2deb し直した、という言及だけでもよい？

debdiff から debian/* を抜粋しますが、autopkgtest まわりのお作法が若干
反映されているというところです。
# 他に debian/patches の hunk 調整もしています。

--
diff -Nru serverspec-runner-0.2.4/debian/control
serverspec-runner-1.2.2/debian/control
--- serverspec-runner-0.2.4/debian/control      2014-10-24
18:15:29.000000000 +0900
+++ serverspec-runner-1.2.2/debian/control      2016-09-01
20:32:20.000000000 +0900
@@ -1,21 +1,30 @@
 Source: serverspec-runner
-Section: ruby
+Section: utils
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers
<pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: KURASHIKI Satoru <lurdan@xxxxxxxxx>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9)
+ , gem2deb
+ , rake
+ , ruby-net-ssh
+ , ruby-rspec
+ , ruby-serverspec
+Standards-Version: 3.9.8
 Vcs-Git: https://github.com/lurdan/serverspec-runner.git
 Vcs-Browser: https://github.com/lurdan/serverspec-runner
 Homepage: https://github.com/hiracy/serverspec-runner
-#Testsuite: autopkgtest
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all

 Package: serverspec-runner
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
- , ruby-serverspec, ruby-net-ssh, rake, ruby-rspec-core, bundler
+ , ruby-serverspec
+ , ruby-net-ssh
+# , rake
+# , ruby-rspec-core
+# , bundler
 Description: simple execution framework for serverspec
  This wrapper program makes it easy to run multiple serverspec
  recipes using one scinario yaml file, with pretty printng.


diff -Nru serverspec-runner-0.2.4/debian/ruby-tests.rake
serverspec-runner-1.2.2/debian/ruby-tests.rake
--- serverspec-runner-0.2.4/debian/ruby-tests.rake      2014-10-22
18:44:07.000000000 +0900
+++ serverspec-runner-1.2.2/debian/ruby-tests.rake      2016-09-01
20:13:41.000000000 +0900
@@ -1,7 +1,5 @@
-require 'rspec/core/rake_task'
+require 'gem2deb/rake/spectask'

-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = './spec/*_spec.rb'
+Gem2Deb::Rake::RSpecTask.new do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
 end
-
-task :default => :spec
diff -Nru serverspec-runner-0.2.4/debian/rules
serverspec-runner-1.2.2/debian/rules
--- serverspec-runner-0.2.4/debian/rules        2014-11-12
21:58:37.000000000 +0900
+++ serverspec-runner-1.2.2/debian/rules        2016-09-01
20:13:41.000000000 +0900
@@ -13,3 +13,8 @@

 %:
        dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_install:
+       mv lib/extension extension
+       dh_auto_install
+       mv extension lib/
diff -Nru serverspec-runner-0.2.4/debian/serverspec-runner.install
serverspec-runner-1.2.2/debian/serverspec-runner.install
--- serverspec-runner-0.2.4/debian/serverspec-runner.install
2014-11-12 21:55:30.000000000 +0900
+++ serverspec-runner-1.2.2/debian/serverspec-runner.install
2016-09-01 20:13:41.000000000 +0900
@@ -3,4 +3,4 @@
 Rakefile usr/share/serverspec-runner
 scenario.yml usr/share/serverspec-runner
 ssh_options_default.yml usr/share/serverspec-runner
-
+lib usr/share/serverspec-runner
diff -Nru serverspec-runner-0.2.4/debian/tests/control.ex
serverspec-runner-1.2.2/debian/tests/control.ex
--- serverspec-runner-0.2.4/debian/tests/control.ex     2014-10-22
18:44:11.000000000 +0900
+++ serverspec-runner-1.2.2/debian/tests/control.ex     2016-09-01
20:13:41.000000000 +0900
@@ -5,7 +5,7 @@
 # be assumed (with the exception of gem2deb being filtered out from
 # @builddeps@):

-Test-Command: gem2deb-test-runner --autopkgtest 2>&1
+Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
 Depends: @, @builddeps@, gem2deb-test-runner

 # if you would need to change something to the above, to that and rename this

> debian/patches/fix-path-issue は DEP-3 ヘッダを追加してください。
> http://dep.debian.net/deps/dep3/

こちらは別途作業のうえで put し直します。

ではでは。
--
KURASHIKI Satoru