2 files changed, 5 insertions, 85 deletions
diff --git a/emacsen-common/install b/emacsen-common/install
index a762adc..7f99ad6 100755
--- a/emacsen-common/install
+++ b/emacsen-common/install
@@ -1,55 +1,6 @@
 #!/bin/sh
-# /usr/lib/emacsen-common/packages/install/${PACKAGE}
+# invoke from /usr/lib/emacsen-common/packages/install/${PACKAGE}
 
 set -e
 
-unset HOME
-
-ELPA_DIR=#ELPAPACKAGE#-#ELPAVERSION#
-
-FLAVOR=$1
-case $FLAVOR in
-    emacs2[0123]*)
-        echo install/${ELPA_DIR}: Skipping obsolete emacs ${FLAVOR}
-        exit 0
-        ;;
-    xemacs*)
-        echo install/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOR}
-        exit 0
-        ;;
-    *)
-        echo install/${ELPA_DIR}: Handling install of emacsen flavor ${FLAVOR}
-esac
-
-src_dir=/usr/share/emacs/site-lisp/elpa-src
-el_dir=$src_dir/${ELPA_DIR}/
-elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_DIR}/
-
-export EMACSLOADPATH
-EMACSLOADPATH="#EMACSLOADPATH#"
-
-echo install/${ELPA_DIR}: byte-compiling for ${FLAVOR}
-
-[ -d ${elc_dir} ] || mkdir -p ${elc_dir}
-
-# Create symlinks to the .el files (see section 6E in debian-emacs
-# polcy).  This makes complation easy, and also allows find-function
-# and find-library to work properly.  Also link all other top level
-# files and directories into the flavor directory
-(cd ${elc_dir} && ln -sf ${el_dir}/* .)
-
-# Byte compile them
-(cd ${elc_dir}
- set +e
- ${FLAVOR} --quick --batch -l package \
-           --eval "(add-to-list 'package-directory-list \"$src_dir\")" \
-           -f package-initialize -f batch-byte-compile *.el > Install.log 2>&1
- if test $? -ne 0
- then
-   cat Install.log
-   exit 1
- fi
- set -e
- gzip -9f Install.log)
-
-exit 0;
+/usr/lib/dh-elpa/helper/install $1 #ELPAPACKAGE# #ELPAVERSION# #EMACSLOADPATH#
diff --git a/emacsen-common/remove b/emacsen-common/remove
index b03204a..5d1d6af 100755
--- a/emacsen-common/remove
+++ b/emacsen-common/remove
@@ -1,37 +1,6 @@
 #!/bin/sh
-# /usr/lib/emacsen-common/packages/remove/foo
-set -e
-
-unset HOME
-
-ELPA_DIR=#ELPAPACKAGE#-#ELPAVERSION#
+# invoke from /usr/lib/emacsen-common/packages/remove/${PACKAGE}
 
-FLAVOR=$1
-elpa_root="/usr/share/${FLAVOR}/site-lisp/elpa"
-elc_dir="${elpa_root}/${ELPA_DIR}"
-
-FLAVOR=$1
-case $FLAVOR in
-    emacs2[0123]*)
-        echo remove/${ELPA_DIR}: Skipping obsolete emacs ${FLAVOR}
-        exit 0
-        ;;
-    xemacs*)
-        echo remove/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOR}
-	exit 0
-        ;;
-    *)
-        echo remove/${ELPA_DIR}: Handling removal of emacsen flavor ${FLAVOR}
-esac
-
-echo dh-elpa: purging flavor specific files for ${FLAVOR}
-rm -f ${elc_dir}/*.elc
-[ -d ${elc_dir} ] && find ${elc_dir} -type l -delete
-rm -f ${elc_dir}/Install.log*
-if test -e "${elc_dir}"
-then
-    rmdir --ignore-fail-on-non-empty "${elc_dir}"
-    rmdir --ignore-fail-on-non-empty "${elpa_root}"
-fi
+set -e
 
-exit 0;
+/usr/lib/dh-elpa/helper/remove $1 #ELPAPACKAGE# #ELPAVERSION# #EMACSLOADPATH#