-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The attached diff fixes this (#419273) bug, as well as #412868. If its
applied after upgrading the upstream 0.22.2 source, it also fixes
#419273! ;)
Micah
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGIx9I9n4qXRzy1ioRAiZ/AJ9RxZFEpu50iuofzfMRSgNzBKaCJQCcCvC5
FmTLNXTFZyYfFF3DJsMO+/Q=
=gdxC
-----END PGP SIGNATURE-----
diff -urN puppet-0.22.1/debian/changelog puppet-0.22.2/debian/changelog
--- puppet-0.22.1/debian/changelog 2007-04-12 21:39:32.000000000 -0600
+++ puppet-0.22.2/debian/changelog 2007-04-16 00:58:11.000000000 -0600
@@ -1,3 +1,15 @@
+puppet (0.22.2-1) unstable; urgency=low
+
+ * Set puppetrun to also be installed in puppetmaster (Closes: #419273)
+ * Install emacs modes for editing .pp files in puppetmaster
+ * Install vim color syntax support (see README.vim for how to activate) in
+ puppetmaster (Closes: #412868)
+ * Install logcheck rules
+ * Added build-dep on libopenssl-ruby
+ * New upstream release (Closes: #415773)
+
+ -- Micah Anderson <[EMAIL PROTECTED]> Sat, 14 Apr 2007 13:31:50 -0600
+
puppet (0.22.1-1) unstable; urgency=low
* New upstream release.
diff -urN puppet-0.22.1/debian/control puppet-0.22.2/debian/control
--- puppet-0.22.1/debian/control 2007-04-12 21:39:32.000000000 -0600
+++ puppet-0.22.2/debian/control 2007-04-12 22:35:05.000000000 -0600
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Jamie Wilkinson <[EMAIL PROTECTED]>
Uploaders: Jamie Wilkinson <[EMAIL PROTECTED]>, Matthew Palmer <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), ruby (>= 1.8.1)
+Build-Depends: debhelper (>= 4.0.0), ruby (>= 1.8.1), libopenssl-ruby
Standards-Version: 3.6.2
Package: puppet
diff -urN puppet-0.22.1/debian/docs puppet-0.22.2/debian/docs
--- puppet-0.22.1/debian/docs 2007-04-12 21:39:32.000000000 -0600
+++ puppet-0.22.2/debian/docs 2007-04-14 16:27:11.000000000 -0600
@@ -1,2 +1,3 @@
README
TODO
+debian/README.vim
diff -urN puppet-0.22.1/debian/puppet.files puppet-0.22.2/debian/puppet.files
--- puppet-0.22.1/debian/puppet.files 2007-04-12 21:39:32.000000000 -0600
+++ puppet-0.22.2/debian/puppet.files 2007-04-14 16:48:20.000000000 -0600
@@ -1,4 +1,5 @@
usr/bin/puppet
+usr/bin/puppetdoc
usr/sbin/puppetd
usr/lib/ruby/1.8/
etc/puppet/puppetd.conf
diff -urN puppet-0.22.1/debian/puppet.logcheck.ignore.server
puppet-0.22.2/debian/puppet.logcheck.ignore.server
--- puppet-0.22.1/debian/puppet.logcheck.ignore.server 1969-12-31
17:00:00.000000000 -0700
+++ puppet-0.22.2/debian/puppet.logcheck.ignore.server 2007-04-14
16:48:46.000000000 -0600
@@ -0,0 +1,15 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Starting Puppet
server version [.0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled
configuration for [._[:alnum:]-]+ in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Caught TERM;
shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting Puppet client
version [.0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: getting config$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Caching configuration at
[\/._[:alnum:]-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Loaded state in [.0-9]+
seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Calling
puppetmaster.getconfig$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Retrieved configuration
in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting configuration
run$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Finished configuration
run in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Caught (TERM|INT);
shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Shutting down$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Restarting with .*$
diff -urN puppet-0.22.1/debian/puppetmaster.files
puppet-0.22.2/debian/puppetmaster.files
--- puppet-0.22.1/debian/puppetmaster.files 2007-04-12 21:39:32.000000000
-0600
+++ puppet-0.22.2/debian/puppetmaster.files 2007-04-14 16:48:29.000000000
-0600
@@ -1,3 +1,7 @@
+usr/bin/puppetrun
usr/sbin/puppetmasterd
usr/sbin/puppetca
etc/puppet/
+etc/emacs/site-start.d/50puppet-mode-init.el
+usr/share/emacs/site-lisp/puppet-mode.el
+usr/share/vim/addons/syntax/puppet.vim
diff -urN puppet-0.22.1/debian/README.vim puppet-0.22.2/debian/README.vim
--- puppet-0.22.1/debian/README.vim 1969-12-31 17:00:00.000000000 -0700
+++ puppet-0.22.2/debian/README.vim 2007-04-14 16:25:24.000000000 -0600
@@ -0,0 +1,12 @@
+For vim color syntax support for puppet .pp files, add the following
+snippit to ~/.vim/filetype.vim:
+
+" detect puppet filetypes
+" $Id: filetype.vim 875 2006-02-07 23:56:16Z luke $
+
+if exists("did_load_filetypes")
+ finish
+endif
+augroup filetypedetect
+ au! BufRead,BufNewFile *.pp setfiletype puppet
+augroup END
diff -urN puppet-0.22.1/debian/rules puppet-0.22.2/debian/rules
--- puppet-0.22.1/debian/rules 2007-04-12 21:39:32.000000000 -0600
+++ puppet-0.22.2/debian/rules 2007-04-14 16:44:13.000000000 -0600
@@ -56,7 +56,7 @@
install -d -m0755 $(localstatedir)/run
install -d -m0755 $(localstatedir)/log/puppet
- $(INSTALL) -m0755 bin/puppet bin/puppetdoc $(bindir)
+ $(INSTALL) -m0755 bin/puppet bin/puppetdoc bin/puppetrun $(bindir)
$(INSTALL) -m0755 bin/puppetd bin/puppetmasterd bin/puppetca $(sbindir)
$(INSTALL) -m0644 lib/puppet.rb $(rubylibdir)/puppet.rb
cp -a lib/puppet $(rubylibdir)
@@ -68,6 +68,16 @@
$(INSTALL) -m0644 debian/puppetmasterd.conf
$(pkgconfdir)/puppetmasterd.conf
$(INSTALL) -m0644 conf/redhat/logrotate $(sysconfdir)/logrotate.d/puppet
+# Add puppet emacs mode
+ $(INSTALL) -m0644 ext/emacs/puppet-mode-init.el
$(sysconfdir)//emacs/site-start.d/50puppet-mode-init.el
+ $(INSTALL) -m0644 ext/emacs/puppet-mode.el
$(prefix)/usr/share/emacs/site-lisp/puppet-mode.el
+
+# Add vim color syntax highlighting
+ $(INSTALL) -m0644 ext/vim/puppet.vim
$(prefix)/usr/share/vim/addons/syntax/puppet.vim
+
+# Add puppet logcheck rules
+ cp ext/logcheck/puppet debian/puppet.logcheck.ignore.server
+
dh_installexamples examples/*
# Clean out any SVN cruft that may still be lingering in our
@@ -82,6 +92,7 @@
dh_testdir
dh_testroot
dh_movefiles -i
+ dh_installlogcheck -i
dh_installchangelogs -i CHANGELOG
dh_installdocs -i
dh_installinit -i
