[DRE-commits] [ruby-mixlib-log] 02/06: update packaging files with `dh-make-ruby --overwrite` + meld

Sat Jun 13 16:14:33 UTC 2015

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

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

commit 832a6ccfa9a5a81afa76337e0f3f8b520188a99d
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jun 12 19:22:29 2015 -0300

    update packaging files with `dh-make-ruby --overwrite` + meld
---
 debian/changelog                |  1 +
 debian/control                  | 17 ++++++++++-------
 debian/patches/series           |  0
 debian/ruby-tests.rake          |  7 +++++++
 debian/ruby-tests.rb            |  1 -
 debian/rules                    | 13 ++-----------
 debian/source.lintian-overrides |  3 ---
 debian/source/local-options     |  1 -
 debian/watch                    |  8 +-------
 9 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6735b5b..74985da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-mixlib-log (1.4.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Remove old transitional packages (Closes: #735708)
+  * update packaging files with `dh-make-ruby --overwrite` + meld
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 12 Jun 2015 19:01:00 -0300
 
diff --git a/debian/control b/debian/control
index 9529797..bbff24d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,23 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Joshua Timberman <joshua at opscode.com>, Paul van Tilburg <paulvt at debian.org>, Praveen Arimbrathodiyil <pravi.a at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-rspec
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-rspec
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mixlib-log.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-mixlib-log.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-mixlib-log.git
 Homepage: http://github.com/opscode/mixlib-log
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-mixlib-log
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Replaces: libmixlib-log-ruby (<< 1.3.0-1~), libmixlib-log-ruby1.8 (<< 1.3.0-1~)
-Breaks: libmixlib-log-ruby (<< 1.3.0-1~), libmixlib-log-ruby1.8 (<< 1.3.0-1~)
-Provides: libmixlib-log-ruby, libmixlib-log-ruby1.8
+Depends: ruby | ruby-interpreter,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Simple Ruby mixin for creating a logger object
  Provides a class based object to provide logging. Messages can be sent at
  different levels such as warn or error. Logging defaults to STDOUT but
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..dcc1601
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,7 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
+end
+
+task :default => :spec
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index f6d0a8a..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1 +0,0 @@
-Dir['{spec}/**/*.rb'].each { |f| require f }
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
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 1f7a688..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# override duplicate description for transitional packages
-ruby-mixlib-log source: duplicate-short-description libmixlib-log-ruby libmixlib-log-ruby1.8
-ruby-mixlib-log source: duplicate-long-description libmixlib-log-ruby libmixlib-log-ruby1.8
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
diff --git a/debian/watch b/debian/watch
index b7dc432..81843f5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,2 @@
 version=3
-#http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/mixlib-log .*/mixlib-log-(.*).tar.gz
-# gem is missing spec files, so using github tarballs instead.
-# requested upstream to include these in gem at
-# https://github.com/opscode/mixlib-log/issues/1
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
-https://github.com/opscode/mixlib-log/tags .*/(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/mixlib-log .*/mixlib-log-(.*).tar.gz

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

