[DRE-commits] [chef-zero] 03/05: Refresh packaging

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository chef-zero.

commit 18112ab465e15cc0c2bbf4c717397434f8c6b2c4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 16:05:03 2015 -0300

    Refresh packaging
---
 debian/changelog           |  2 ++
 debian/control             | 42 ++++++++++++++++++++++--------------------
 debian/patches/no-rubygems |  2 +-
 debian/rules               | 13 ++-----------
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dd1afc..78f17db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 chef-zero (4.2.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Update packaging with a new dh-make-ruby run
+  * Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 15:55:41 -0300
 
diff --git a/debian/control b/debian/control
index 7a56924..417d385 100644
--- a/debian/control
+++ b/debian/control
@@ -2,34 +2,36 @@ Source: chef-zero
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Stefano Rivera <stefanor at debian.org>
-Build-Depends:
- debhelper (>= 8.1~),
- gem2deb (>= 0.6.1~),
- ruby-hashie (>= 2),
- ruby-mixlib-log (>= 1.3),
- ruby-rack,
- ruby-rspec,
- ruby-uuidtools (>= 2.1)
+Uploaders: Stefano Rivera <stefanor at debian.org>, Antonio Terceiro <terceiro at debian.org>
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-ffi-yajl (<< 3.0),
+               ruby-ffi-yajl (>= 1.1),
+               ruby-hashie (>= 2.0),
+               ruby-mixlib-log (>= 1.3),
+               ruby-rack,
+               ruby-rspec,
+               ruby-uuidtools (>= 2.1)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/chef-zero.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/chef-zero.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/chef-zero.git
 Homepage: http://www.opscode.com
 XS-Ruby-Versions: all
-XS-Testsuite: autopkgtest
+Testsuite: autopkgtest
 
 Package: chef-zero
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends:
- ruby | ruby-interpreter,
- ruby-hashie (>= 2),
- ruby-json,
- ruby-mixlib-log (>= 1.3),
- ruby-rack,
- ruby-uuidtools (>= 2.1),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ruby | ruby-interpreter,
+         ruby-ffi-yajl (<< 3.0),
+         ruby-ffi-yajl (>= 1.1),
+         ruby-hashie (>= 2.0),
+         ruby-mixlib-log (>= 1.3),
+         ruby-rack,
+         ruby-uuidtools (>= 2.1),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: in-memory Chef server (for testing and solo purposes)
  Chef is a systems integration framework and configuration management library
  written in Ruby.
diff --git a/debian/patches/no-rubygems b/debian/patches/no-rubygems
index 07fd252..65d913c 100644
--- a/debian/patches/no-rubygems
+++ b/debian/patches/no-rubygems
@@ -13,7 +13,7 @@ Last-Updated: 2014-01-09
 -require 'rubygems'
  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
  
- require 'chef_zero/version'
+ require 'chef_zero/log'
 --- a/lib/chef_zero/server.rb
 +++ b/lib/chef_zero/server.rb
 @@ -18,7 +18,6 @@
diff --git a/debian/rules b/debian/rules
index 82ddc0c..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.9.1 ruby2.0 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/chef-zero.git