[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. puppet-0.24.5-rc3-1689-ge376349

[Micah Anderson]

The following commit has been merged in the master branch:
commit e376349bf1563553828d0130a4054ff729ac66dc
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Jan 31 18:09:34 2010 -0500

    part of the emacs pieces were being installed in the puppet package, instead of puppet-el. this fixes that by adjusting the rules file

diff --git a/debian/changelog b/debian/changelog
index 22794fb..1163bdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ puppet (0.25.4-1) unstable; urgency=low
   * New upstream version 0.25.4
  
   [ Micah Anderson ]
-  * Fix debian/rules install of puppet-mode-init.el
+  * Fix debian/rules typo in install of puppet-mode-init.el
+  * Fix which package puppet-mode-init.el gets installed into
 
  -- Nigel Kersten <nigel at explanatorygap.net>  Fri, 29 Jan 2010 08:38:53 -0800
 
diff --git a/debian/rules b/debian/rules
index eaec35f..d14582a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install: build
 
 	# Emacs mode
 	$(INSTALL) -m0644 ext/emacs/puppet-mode-init.el			\
-		$(CURDIR)/debian/puppet-el.emacsen-startup
+		$(CURDIR)/debian/puppet-el/puppet-el.emacsen-startup
 	$(INSTALL) -m0644 ext/emacs/puppet-mode.el			\
 		$(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
 

-- 
Puppet packaging for Debian