[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. f6c5e4422462ffbfbee2002cb4cabc4c60b33c36

[Micah Anderson]

The following commit has been merged in the master branch:
commit f6c5e4422462ffbfbee2002cb4cabc4c60b33c36
Author: Micah Anderson <micah at riseup.net>
Date:   Fri Apr 18 14:53:38 2008 -0400

    Go back to having Required- headers for LSB as it seems like netbase should be installed to do anything useful with puppet

diff --git a/debian/changelog b/debian/changelog
index 8f61f1d..2833cec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,9 @@ puppet (0.24.4-4) unstable; urgency=low
   * Modify /etc/init.d/puppetmaster to support mongrel instances
     on multiple ports
   * Remove no longer necessary .svn cleaning from debian/rules
-  * Add $network and $named to Required-Start and Required-Stop 
-    LSB headers in puppet and puppetmaster initscripts, 
+  * Added $network and $named appropriated places in the LSB
+    headers in puppet and puppetmaster initscripts, 
     thanks Sam Quigley
-  * Added Should-Start: $network and Should-Stop: $network in 
-    puppetmaster initscript
   * Install ralsh (Closes: #476629)
   * Cherry-pick upstream patches from 0.24.x branch:
     - Install manpages
diff --git a/debian/puppet.init b/debian/puppet.init
index c18d0bd..5a453d6 100644
--- a/debian/puppet.init
+++ b/debian/puppet.init
@@ -1,11 +1,11 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          puppet                                                                                                                                
+# Provides:          puppet
 # Required-Start:    $network $named $remote_fs $syslog
 # Required-Stop:     $network $named $remote_fs $syslog
-# Should-Start:      puppetmaster                                                                                                                          
-# Default-Start:     2 3 4 5                                                                                                                               
-# Default-Stop:      0 1 6                                                                                                                                 
+# Should-Start:      puppetmaster
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
 ### END INIT INFO                                                                                                                                          
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
index 709e8b1..bc84641 100644
--- a/debian/puppetmaster.init
+++ b/debian/puppetmaster.init
@@ -1,10 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          puppetmaster                                                                                                                          
-# Required-Start:    $named $remote_fs $syslog
-# Required-Stop:     $named $remote_fs $syslog
-# Should-Start:      $network
-# Should-Stop:	     $network
+# Required-Start:    $network $named $remote_fs $syslog
+# Required-Stop:     $network $named $remote_fs $syslog
 # Default-Start:     2 3 4 5                                                                                                                               
 # Default-Stop:      0 1 6                                                                                                                                 
 ### END INIT INFO                 

-- 
Puppet packaging for Debian