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

[Micah Anderson]

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

    fix up the emacsen startup/installation

diff --git a/debian/control b/debian/control
index 1b514fa..e54f47b 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Description: Vim syntax highlighting for puppet manifests
 
 Package: puppet-el
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, emacsen-common
 Conflicts: puppet (<< ${source:Version})
 Description: Emacs syntax highlighting for puppet manifests
  The puppet-el package provides syntax highlighting for puppet manifests
diff --git a/debian/puppet-el.emacsen-install b/debian/puppet-el.emacsen-install
new file mode 100644
index 0000000..89aa183
--- /dev/null
+++ b/debian/puppet-el.emacsen-install
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# emacsen install script for the Debian GNU/Linux cmake package
+
+FLAVOR=$1
+PACKAGE=puppet-el
+
+ELDIR=/usr/share/emacs/site-lisp/
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+ELFILE="puppet-mode.el"
+FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile"
+
+if [ ${FLAVOR} != emacs ]; then
+  echo install/${PACKAGE}: Byte-compiling for ${FLAVOR}
+
+  install -m 755 -d ${ELCDIR}
+  cd ${ELDIR}
+  cp ${ELFILE} ${ELCDIR}
+  cd ${ELCDIR}
+  cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+  ${FLAVOR} ${FLAGS} ${ELFILE}
+  rm -f ${ELFILE} path.el
+fi
diff --git a/debian/puppet-el.emacsen-remove b/debian/puppet-el.emacsen-remove
new file mode 100644
index 0000000..a353812
--- /dev/null
+++ b/debian/puppet-el.emacsen-remove
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+FLAVOR=$1
+PACKAGE=puppet-el
+ELCFILE=puppet-mode.elc
+
+if [ ${FLAVOR} != emacs ]; then
+  echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
+  rm -f /usr/share/${FLAVOR}/site-lisp/${ELCFILE}
+fi
diff --git a/ext/emacs/puppet-mode-init.el b/debian/puppet-el.emacsen.startup
similarity index 61%
copy from ext/emacs/puppet-mode-init.el
copy to debian/puppet-el.emacsen.startup
index 9ac47ff..e343b3e 100644
--- a/ext/emacs/puppet-mode-init.el
+++ b/debian/puppet-el.emacsen.startup
@@ -1,6 +1,9 @@
+;; -*-emacs-lisp-*-
 ;;
-;; Setup puppet-mode for autoloading
-;;
+;; Emacs startup file for the Debian GNU/Linux puppet-el package
+
 (autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
 
 (add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
+
+
diff --git a/debian/puppet-el.install b/debian/puppet-el.install
new file mode 100644
index 0000000..39ec72b
--- /dev/null
+++ b/debian/puppet-el.install
@@ -0,0 +1 @@
+ext/emacs/puppet-mode.el
diff --git a/debian/rules b/debian/rules
index 7b10b4c..50298af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,6 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -f debian/puppet-common.logcheck.ignore.server
-	rm -f debian/puppet-el.emacsen-startup
 	dh_clean 
 
 install: build
@@ -65,8 +64,6 @@ install: build
 		$(CURDIR)/debian/vim-puppet/usr/share/vim/registry/
 
 	# Emacs mode
-	$(INSTALL) -m0644 ext/emacs/puppet-mode-init.el			\
-		$(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