[DRE-commits] [ruby-rubymail] 01/03: Update packaging with a new dh-make-ruby run + manual adjustments

Antonio Terceiro terceiro at moszumanska.debian.org
Wed Jul 1 18:50:56 UTC 2015


This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-rubymail.

commit bf4a229e8ed3b1173799fb5ac70710462abce1b6
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Jul 1 15:28:16 2015 -0300

    Update packaging with a new dh-make-ruby run + manual adjustments
---
 debian/changelog                  |  7 +++++++
 debian/control                    | 37 ++++++++++++++++++++-----------------
 debian/dirs                       |  1 -
 debian/gbp.conf                   |  2 --
 debian/ruby-rubymail-doc.examples |  1 -
 debian/ruby-rubymail.install      |  1 -
 debian/ruby-tests.rake            |  6 ++++++
 debian/ruby-tests.rb              |  2 --
 debian/rules                      | 13 ++-----------
 debian/source/local-options       |  1 -
 10 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b712d1..5c0c122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-rubymail (1.1.0-2) unstable; urgency=medium
+
+  * Update packaging with a new dh-make-ruby run + manual adjustments
+    - should fix test suite run on CI
+
+ -- Antonio Terceiro <terceiro at debian.org>  Wed, 01 Jul 2015 15:18:12 -0300
+
 ruby-rubymail (1.1.0-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c9156df..9c2235d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,15 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Per Andersson <avtobiff at gmail.com>, Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.16~), rake, ruby-test-unit
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-test-unit,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rubymail.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-rubymail.git;a=summary
-Homepage: http://rubyforge.org/projects/rubymail/
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-rubymail.git
+Homepage: https://github.com/terceiro/rmail
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-rubymail-doc
@@ -18,21 +22,20 @@ Suggests: ruby-rubymail
 Replaces: librmail-ruby-doc (<< 1.0.0-1~)
 Breaks: librmail-ruby-doc (<< 1.0.0-1~)
 Provides: librmail-ruby-doc
-Description: lightweight mail library for Ruby (documentation)
- RubyMail is a lightweight mail library containing various utility classes
- and modules that allow Ruby scripts to parse, modify, and generate MIME
- mail messages.
+Description: MIME mail parsing and generation library (documentation)
+ RMail is a lightweight mail library containing various utility classes and
+ modules that allow ruby scripts to parse, modify, and generate MIME mail
+ messages.
+ .
+ This package contains the documentation.
 
 Package: ruby-rubymail
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${misc:Depends}, ruby | ruby-interpreter
-Suggests: ruby-rubymail-doc
-Replaces: librmail-ruby1.8 (<< 1.0.0-1~)
-Breaks: librmail-ruby1.8 (<< 1.0.0-1~)
-Provides: librmail-ruby1.8
-Description: lightweight mail library for Ruby
- This is RubyMail, a lightweight mail library containing various utility
- classes and modules that allow Ruby scripts to parse, modify, and generate
- MIME mail messages.
-
+Depends: ruby | ruby-interpreter,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: MIME mail parsing and generation library
+ RMail is a lightweight mail library containing various utility classes and
+ modules that allow ruby scripts to parse, modify, and generate MIME mail
+ messages.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 01ec994..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ruby
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index cec628c..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-pristine-tar = True
diff --git a/debian/ruby-rubymail-doc.examples b/debian/ruby-rubymail-doc.examples
deleted file mode 100644
index 9daeafb..0000000
--- a/debian/ruby-rubymail-doc.examples
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/debian/ruby-rubymail.install b/debian/ruby-rubymail.install
deleted file mode 100644
index a39306d..0000000
--- a/debian/ruby-rubymail.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/* usr/lib/ruby/vendor_ruby/
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..f58d8ba
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,6 @@
+require 'gem2deb/rake/testtask'
+
+Gem2Deb::Rake::TestTask.new do |t|
+  t.libs << '.'
+  t.test_files = FileList['test/test*.rb']
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index f12c5dc..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-$: << 'lib' << 'test' << '.'
-Dir['test/test*.rb'].each { |f| require f }
diff --git a/debian/rules b/debian/rules
index 88acd31..cce60d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rubymail.git



More information about the Pkg-ruby-extras-commits mailing list