[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-2-5-g7b014ef

[Micah Anderson]

The following commit has been merged in the master branch:
commit 91ee4eef9f64a44164b4d9fb4e078475c3aaa4d1
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Mar 21 21:15:07 2010 -0400

    fix missing line continuation for the README.rack

diff --git a/debian/changelog b/debian/changelog
index c4553cf..311558c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ puppet (0.25.4-4) UNRELEASED; urgency=low
   * Create puppetmaster.README with information about the server type
   * Provide an example apache2.conf for libapache2-mod-passenger
   * Ship the rack config.ru, and README as README.rack
+  * Fix puppet-el.emacsen-startup script to be properly installed
 
  -- Micah Anderson <micah at debian.org>  Tue, 16 Mar 2010 12:27:07 -0400
 
diff --git a/debian/puppet-el.emacsen.startup b/debian/puppet-el.emacsen-startup
similarity index 100%
rename from debian/puppet-el.emacsen.startup
rename to debian/puppet-el.emacsen-startup
diff --git a/debian/rules b/debian/rules
index 16294ed..4cd17cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ install: build
 		$(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
 
 	# Install the rack README as README.rack
-	$(INSTALL) -m0644 ext/rack/README
+	$(INSTALL) -m0644 ext/rack/README \
 		$(CURDIR)/debian/puppetmaster/usr/share/doc/puppetmaster/README.rack
 	# Install the config.ru and the necessary helper directories
 	$(INSTALL) -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd

-- 
Puppet packaging for Debian