Drop emacs byte-compiling support

diff --git a/ChangeLog b/ChangeLog
index baec361d56c4dd02c4130c4142f2ce367b608872..193cfa486ff74b7caaf3e89d12f468bea73d3c05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec  7 17:41:17 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Drop the emacs bytecompile-stuff completely
+
 Tue Dec  7 14:08:21 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Fix display of copyright in menu

diff --git a/configure.in b/configure.in
index 0ac543c66d1a8c568fa5b0d69e1d1a3598773a8a..34b8ce71fa2e82d975cc642fe9faea2ba6f67013 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,7 @@ AC_CHECK_PROG(RM,rm,rm -f)
 AC_CHECK_PROG(SED,sed,sed)
 AC_PROG_INSTALL
 dnl Default in case EMACS == no
-lispdir="\$(datadir)/emacs/site-lisp/$PACKAGE"
+lispdir="\$(datadir)/emacs/site-lisp/"
 AM_PATH_LISPDIR
 AC_MODE_T
 AC_PID_T

diff --git a/debian/changelog b/debian/changelog
index 6171e828fb9c35ff71d990a746e6961401389e32..414898dfaedc969a43bf0e23537fb2ff819b54fc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.6.4) unstable; urgency=low
+
+  * No longer byte-compile for emacs
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.6.3) unstable; urgency=high
 
   * Comment dselect changes from 1.6.2, they seem to have a problem

diff --git a/debian/emacsen-common-install b/debian/emacsen-common-install
deleted file mode 100755 (executable)
index 8567422..0000000
--- a/debian/emacsen-common-install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-
-FLAVOR=$1
-PACKAGE=dpkg
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-files="debian-changelog-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 ${files} ${ELCDIR}
-  cd ${ELCDIR}
-  cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-  ${FLAVOR} ${flags} ${files}
-  rm -f *.el path.el
-fi

diff --git a/debian/emacsen-common-remove b/debian/emacsen-common-remove
deleted file mode 100755 (executable)
index 2a0b0b2..0000000
--- a/debian/emacsen-common-remove
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-FLAVOR=$1
-PACKAGE=dpkg
-
-if [ ${FLAVOR} != emacs ]; then
-  echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
-  rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-  rm -f /etc/${FLAVOR}/site-start.d/50dpkg-dev.el
-fi

diff --git a/debian/rules b/debian/rules
index 78e8592baeafee76eb095e8d495823f5bda6ad12..b8bbf1f18b1f9299c83b5a7fdb9217f02002d650 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -166,12 +166,6 @@ binary-dpkg-dev: stamp-binary
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/etc/emacs/site-start.d
        install -p -m 644 -o root -g root debian/50dpkg-dev.el \
                $(TMP_DPKG_DEV)/etc/emacs/site-start.d
-       install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/install
-       install -p -m 755 -o root -g root debian/emacsen-common-install \
-               $(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/install
-       install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/remove
-       install -p -m 755 -o root -g root debian/emacsen-common-remove \
-               $(TMP_DPKG_DEV)/usr/lib/emacsen-common/packages/remove
 
 # Final package creation
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/DEBIAN