[DRE-commits] [chef] 12/13: Merge remote-tracking branch 'origin/master'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository chef.

commit b233184a5bafebf0b2978e690ea6053c0ca4497f
Merge: 6e50772 0642f77
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Oct 31 11:00:03 2016 -0200

    Merge remote-tracking branch 'origin/master'

 debian/changelog | 8 ++++++++
 debian/control   | 2 ++
 2 files changed, 10 insertions(+)

diff --cc debian/changelog
index 6d63a8c,ef7c006..516d8f3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,17 +1,26 @@@
 -chef (12.11.18-1) UNRELEASED; urgency=medium
 -
 -  [ Antonio Terceiro ]
 -  * New upstream release
 -    - new dependency: ruby-iniparse
 -    - update dependency constraint on ruby-chef-config
 -  * debian/copyright:
 -    - update filename of windows gemspec in Files-Excluded
++chef (12.14.60-2) UNRELEASED; urgency=medium
+ 
+   [ Christian Hofstaedtler ]
+   * Depend on init-system-helpers (for invoke-rc.d) and lsb-base
+     (for /lib/lsb/init-functions). (Closes: #839718)
+ 
 - -- Antonio Terceiro <terceiro at debian.org>  Fri, 24 Jun 2016 14:24:33 -0300
++ -- Antonio Terceiro <terceiro at debian.org>  Mon, 31 Oct 2016 10:59:34 -0200
++
 +chef (12.14.60-1) unstable; urgency=medium
 +
 +  * New upstream release
 +    - works with chef-zero 5.0 (Closes: #837228)
 +    - refresh patches
 +    - several updates to the list of dependencies
 +    - add patch to accept rspec 3.4 while it is not updated in Debian
 +  * debian/copyright:
 +    - update filename of windows gemspec in Files-Excluded
 +  * debian/ruby-tests.blacklist: add a few more tests to the blacklist;
 +    unfortunately I don't have the time to investigate the issues with them
 +    more deeply.
 +  * Added dependency on lsb-base for initscript
 +
 + -- Antonio Terceiro <terceiro at debian.org>  Mon, 31 Oct 2016 10:10:35 -0200
  
  chef (12.10.24-1) unstable; urgency=medium
  
diff --cc debian/control
index a86c4e4,d965537..cffdc95
--- a/debian/control
+++ b/debian/control
@@@ -4,9 -4,11 +4,11 @@@ Priority: optiona
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders: Antonio Terceiro <terceiro at debian.org>,
             Tollef Fog Heen <tfheen at debian.org>
 -Build-Depends: chef-zero (>= 4.5),
 +Build-Depends: chef-zero (>= 4.8),
                 debhelper (>= 9~),
                 gem2deb,
+                init-system-helpers,
+                lsb-base,
                 lsb-release,
                 po-debconf,
                 ohai (<< 9),

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