[DRE-commits] [ruby-httpclient] 04/05: Update packaging with a new dh-make-ruby run

Antonio Terceiro terceiro at moszumanska.debian.org
Mon Feb 29 20:22:09 UTC 2016


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

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

commit 0648e6584eb278a12f6d4527b423bf4234990961
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 29 16:23:35 2016 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog            |  6 ++++++
 debian/control              | 26 ++++++++++++++------------
 debian/copyright            | 10 +++++-----
 debian/ruby-httpclient.docs |  2 +-
 debian/ruby-test-files.yaml | 10 ----------
 debian/ruby-tests.rake      |  6 ++++++
 debian/rules                | 13 ++-----------
 7 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee729f5..41935a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ ruby-httpclient (2.7.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Refresh patches
+  * Update packaging with a new dh-make-ruby run
+    - bump Standards-Version to 3.9.7; no changes needed
+    - switch Vcs-* to https URLs
+    - debian/copyright: remove trailing spaces
+    - replace debian/ruby-test-files.yaml with debian/ruby-tests.rake
+    - cleanup debian/rules
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 29 Feb 2016 16:14:40 -0300
 
diff --git a/debian/control b/debian/control
index 7ddbadc..9b8994b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,28 @@ Source: ruby-httpclient
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Antonio Terceiro <terceiro at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Gunnar Wolf <gwolf at debian.org>
-Build-Depends: debhelper (>= 9.0),
+Uploaders: Antonio Terceiro <terceiro at debian.org>,
+           Ryan Niebur <ryanryan52 at gmail.com>,
+           Gunnar Wolf <gwolf at debian.org>
+Build-Depends: debhelper (>= 9~),
                gem2deb,
-               ruby-test-unit,
-               ruby-rack,
-               ruby-http-cookie (>= 1.0)
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-httpclient.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-httpclient.git/
-Homepage: http://github.com/nahi/httpclient
+               rake,
+               ruby-http-cookie (>= 1.0),
+               ruby-rack
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-httpclient.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-httpclient.git
+Homepage: https://github.com/nahi/httpclient
 Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-httpclient
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends},
+Depends: ruby | ruby-interpreter,
+         ruby-http-cookie (>= 1.0),
          ${misc:Depends},
-         ruby | ruby-interpreter,
-         ruby-http-cookie (>= 1.0)
+         ${shlibs:Depends}
 Description: HTTP client library for ruby
  httpclient gives something like the functionality of
  libwww-perl (LWP) in Ruby.
diff --git a/debian/copyright b/debian/copyright
index 3b23d66..e737376 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,7 +37,7 @@ License: Ruby
  1. You may make and give away verbatim copies of the source form of the
     software without restriction, provided that you duplicate all of the
     original copyright notices and associated disclaimers.
- . 
+ .
  2. You may modify your copy of the software in any way, provided that
     you do at least ONE of the following:
       a) place your modifications in the Public Domain or otherwise
@@ -49,7 +49,7 @@ License: Ruby
       c) rename any non-standard executables so the names do not conflict
          with standard executables, which must also be provided.
       d) make other distribution arrangements with the author.
- . 
+ .
  3. You may distribute the software in object code or executable
     form, provided that you do at least ONE of the following:
       a) distribute the executables and library files of the software,
@@ -60,7 +60,7 @@ License: Ruby
       c) give non-standard executables non-standard names, with
          instructions on where to get the original software distribution.
       d) make other distribution arrangements with the author.
- . 
+ .
  4. You may modify and include the part of the software into any other
     software (possibly commercial).  But some files in the distribution
     are not written by the author, so that they are not under this terms.
@@ -68,9 +68,9 @@ License: Ruby
     glob.c, st.[ch] and some files under the ./missing directory.  See
     each file for the copying condition.
  .
- 5. The scripts and library files supplied as input to or produced as 
+ 5. The scripts and library files supplied as input to or produced as
     output from the software do not automatically fall under the
-    copyright of the software, but belong to whomever generated them, 
+    copyright of the software, but belong to whomever generated them,
     and may be sold commercially, and may be aggregated with this
     software.
  .
diff --git a/debian/ruby-httpclient.docs b/debian/ruby-httpclient.docs
index d0ab95f..b43bf86 100644
--- a/debian/ruby-httpclient.docs
+++ b/debian/ruby-httpclient.docs
@@ -1 +1 @@
-# FIXME: READMEs found
+README.md
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 938c8c2..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
--  test/test_ssl.rb
--  test/test_include_client.rb
--  test/test_auth.rb
--  test/test_httpclient.rb
--  test/test_jsonclient.rb
--  test/test_webagent-cookie.rb
--  test/test_http-access2.rb
--  test/test_cookie.rb
--  test/test_hexdump.rb
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..63f3fd6
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,6 @@
+require 'gem2deb/rake/testtask'
+
+Gem2Deb::Rake::TestTask.new do |t|
+  t.libs = ['test']
+  t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+end
diff --git a/debian/rules b/debian/rules
index a5e7dc8..3454d59 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

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



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