[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-114-g8514fa4

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 78f631bea9db64a90aafe37abdd619110a5af4be
Author: Andrew Pollock <apollock at dhcp-172-18-115-243.mtv.corp.google.com>
Date:   Wed May 27 23:27:49 2009 +0200

    Re-add the remainder of the 0.24.5-3 upload that was never checked into the git repository and so subsequently disappeared with later uploads

diff --git a/debian/changelog b/debian/changelog
index cf9674c..8e00bae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 puppet (0.24.8-2) UNRELEASED; urgency=low
 
+  [ Micah Anderson ]
   * Cherry-pick upstream versioncmp fix (redmine:#2110)
-  * Change the vim syntax highlighting installation to use vimcurrent
 
- -- Micah Anderson <micah at debian.org>  Tue, 14 Apr 2009 14:21:11 -0400
+  [ Andrew Pollock ]
+  * Enable waiting for certificates for the default value (upstream default
+    that was previously disabled or enabled with a 5 second value)
+  * Re-ship the vim syntax file in the correct location (it fell out after the
+    0.24.5-3 upload)
+  * Re-add the 0.24.5-3 changelog entry
+
+ -- Andrew Pollock <apollock at dhcp-172-18-115-243.mtv.corp.google.com>  Wed, 27 May 2009 23:21:01 +0200
 
 puppet (0.24.8-1) unstable; urgency=low
 
@@ -50,6 +57,15 @@ puppet (0.24.6-1) experimental; urgency=low
 	
  -- Micah Anderson <micah at debian.org>  Sat, 29 Nov 2008 13:59:25 -0500
 
+puppet (0.24.5-3) unstable; urgency=medium
+
+  * Set wait for cert timeout to 5 secs, to avoid resource abuse (Closes:
+    #509566)
+  * Distribute filebucket binary (Closes: #499999)
+  * Place vim syntax in the correct location (LP: #181960)
+
+ -- Thom May <thom at debian.org>  Wed, 07 Jan 2009 15:15:34 -0500
+
 puppet (0.24.5-2) unstable; urgency=low
 
   * Fix puppetlast to work with 0.24.5
diff --git a/debian/puppet.default b/debian/puppet.default
index 3e0ee04..32b3697 100644
--- a/debian/puppet.default
+++ b/debian/puppet.default
@@ -4,4 +4,4 @@
 START=yes
 
 # Startup options
-DAEMON_OPTS="-w 0"
+DAEMON_OPTS=""
diff --git a/debian/puppet.dirs b/debian/puppet.dirs
index 9ce18f8..3dec324 100644
--- a/debian/puppet.dirs
+++ b/debian/puppet.dirs
@@ -3,5 +3,5 @@ usr/lib/ruby/1.8
 var/log/puppet
 etc/puppet/files
 usr/share/vim/addons/ftdetect
-usr/share/vim/vim71/syntax
+usr/share/vim/addons/syntax
 var/lib/puppet
diff --git a/debian/rules b/debian/rules
index e379d0f..a06c07e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ install: build
 
 	# Vim auto-syntax-highlighting stuff
 	$(INSTALL) -m0644 ext/vim/syntax/puppet.vim				\
-		$(CURDIR)/debian/puppet/usr/share/vim/vimcurrent/syntax/
+		$(CURDIR)/debian/puppet/usr/share/vim/addons/syntax/
 	$(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim				\
 		$(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/
 

-- 
Puppet packaging for Debian