update templates to rely on substitution

1 files changed, 5 insertions, 8 deletions

diff --git a/emacsen-common/remove b/emacsen-common/remove
index 58021f9..dfa0df7 100755
--- a/emacsen-common/remove
+++ b/emacsen-common/remove
@@ -2,13 +2,10 @@
 # /usr/lib/emacsen-common/packages/remove/foo
 set -e
 
-PACKAGE=$DPKG_MAINTSCRIPT_PACKAGE
-VERSION=$(dpkg-query -Wf '${Version}' $PACKAGE)
-UPSTREAM_VERSION=${VERSION%-*}
-ELPA_PACKAGE=${PACKAGE#elpa-}-${UPSTREAM_VERSION}
+ELPA_DIR=#ELPAPACKAGE#-#ELPAVERSION#
 
 FLAVOR=$1
-elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_PACKAGE}
+elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_DIR}
 
 FLAVOR=$1
 case $FLAVOR in
@@ -16,14 +13,14 @@ case $FLAVOR in
         exit 0
         ;;
     emacs23)
-        echo remove/${ELPA_PACKAGE}: Skipping obsolete emacs ${FLAVOUR}
+        echo remove/${ELPA_DIR}: Skipping obsolete emacs ${FLAVOUR}
         exit 0
         ;;
     xemacs*)
-           echo remove/${ELPA_PACKAGE}: Skipping unsupported emacs ${FLAVOUR}
+           echo remove/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOUR}
         ;;
     *)
-        echo remove/${ELPA_PACKAGE}: Handling removal of emacsen flavor ${FLAVOR}
+        echo remove/${ELPA_DIR}: Handling removal of emacsen flavor ${FLAVOR}
 esac
 
 echo dh-elpa: purging flavor specific files for ${FLAVOR}