diff -Nru puppet-3.8.5/debian/changelog puppet-3.8.5/debian/changelog --- puppet-3.8.5/debian/changelog 2016-03-15 09:17:39.000000000 +0000 +++ puppet-3.8.5/debian/changelog 2016-03-15 11:28:53.000000000 +0000 @@ -1,13 +1,9 @@ -puppet (3.8.5-1ubuntu1) xenial; urgency=medium +puppet (3.8.5-2) unstable; urgency=medium - * Merge with Debian unstable. Remaining Ubuntu changes: - - debian/puppet{,master}.init: Wait until the puppet and puppetmaster - daemons are actually stopped before returning. (LP: #1315021) - * Put back Recommends: for ruby-activerecord and - ruby-activerecord-deprecated-finders, as puppet is back in universe. (Drop - Ubuntu delta). + * [7b9bf62] sysvinit: fix service restart. + Thanks to Martin Pitt (Closes: #818267) - -- Martin Pitt Tue, 15 Mar 2016 10:11:02 +0100 + -- Stig Sandbeck Mathisen Tue, 15 Mar 2016 12:28:44 +0100 puppet (3.8.5-1) unstable; urgency=medium @@ -16,17 +12,6 @@ -- Stig Sandbeck Mathisen Thu, 28 Jan 2016 10:44:16 +0100 -puppet (3.8.4-1ubuntu1) xenial; urgency=medium - - * Merge with Debian unstable. Remaining Ubuntu changes: - - fix wrong process name match in logrotate script. - - debian/puppet{,master}.init: Wait until the puppet and puppetmaster - daemons are actually stopped before returning. - - puppetmaster-common: Suggest instead of recommending ruby-activerecord - and ruby-activerecord-deprecated-finders (universe). - - -- Martin Pitt Tue, 24 Nov 2015 08:19:42 +0100 - puppet (3.8.4-1) unstable; urgency=medium * Imported upstream release 3.8.4 (CVE-2015-7328) @@ -61,22 +46,6 @@ -- Stig Sandbeck Mathisen Sat, 29 Aug 2015 21:14:23 +0200 -puppet (3.7.2-5ubuntu2) wily; urgency=medium - - * puppetmaster-common: Suggest instead of recommending ruby-activerecord - and ruby-activerecord-deprecated-finders (universe). - - -- Matthias Klose Fri, 11 Sep 2015 20:40:13 +0200 - -puppet (3.7.2-5ubuntu1) wily; urgency=medium - - * Merge with Debian; remaining changes: - - fix wrong process name match in logrotate script. - - Wait until the puppet and puppetmaster daemons are actually stopped - before returning. - - -- Matthias Klose Wed, 09 Sep 2015 12:50:52 +0200 - puppet (3.7.2-5) unstable; urgency=medium [ Jonas Genannt ] @@ -122,19 +91,6 @@ -- Stig Sandbeck Mathisen Thu, 05 Feb 2015 22:44:49 +0100 -puppet (3.7.2-1ubuntu2) vivid; urgency=medium - - * fix wrong process name match in logrotate script (LP: #1410383) - - -- Bartosz Cisek Fri, 20 Mar 2015 15:56:13 +0100 - -puppet (3.7.2-1ubuntu1) vivid; urgency=medium - - * Wait until the puppet and puppetmaster daemons are actually stopped - before returning (LP: #1315021) - - -- Felipe Reyes Wed, 04 Feb 2015 11:36:12 -0300 - puppet (3.7.2-1) unstable; urgency=medium * Imported upstream release 3.7.2 diff -Nru puppet-3.8.5/debian/control puppet-3.8.5/debian/control --- puppet-3.8.5/debian/control 2016-03-15 09:17:03.000000000 +0000 +++ puppet-3.8.5/debian/control 2016-03-15 11:28:53.000000000 +0000 @@ -1,8 +1,7 @@ Source: puppet Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Puppet Package Maintainers +Maintainer: Puppet Package Maintainers Uploaders: Micah Anderson , Andrew Pollock , Nigel Kersten , diff -Nru puppet-3.8.5/debian/puppet.init puppet-3.8.5/debian/puppet.init --- puppet-3.8.5/debian/puppet.init 2016-03-15 09:07:25.000000000 +0000 +++ puppet-3.8.5/debian/puppet.init 2016-03-15 11:28:53.000000000 +0000 @@ -63,7 +63,6 @@ restart|force-reload) log_begin_msg "Restarting $DESC" stop_puppet_agent - sleep 1 start_puppet_agent log_end_msg $? ;; diff -Nru puppet-3.8.5/debian/puppetmaster.init puppet-3.8.5/debian/puppetmaster.init --- puppet-3.8.5/debian/puppetmaster.init 2016-03-15 09:07:25.000000000 +0000 +++ puppet-3.8.5/debian/puppetmaster.init 2016-03-15 11:28:53.000000000 +0000 @@ -82,7 +82,6 @@ restart|force-reload) log_begin_msg "Restarting $DESC" stop_puppet_master - sleep 1 start_puppet_master log_end_msg $? ;;