Record dh-elpa (1.6) in archive suite sid

4 files changed, 8 insertions, 9 deletions

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 5d42584..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-debian/changelog merge=dpkg-mergechangelogs
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fccc6aa..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/debian/dh-elpa.debhelper.log
-/debian/dh-elpa.postinst.debhelper
-/debian/dh-elpa.prerm.debhelper
-/debian/dh-elpa.substvars
-/debian/files
-/dh_elpa.1
-/dh_elpa_test.1
diff --git a/debian/changelog b/debian/changelog
index cc52e74..295ea68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-elpa (1.6) unstable; urgency=medium
+
+  * Add an "exit 0" to xemacs case of remove script (Closes: #850036).
+
+ -- David Bremner <bremner@debian.org>  Sun, 08 Jan 2017 09:28:52 -0400
+
 dh-elpa (1.5) unstable; urgency=high
 
   * Add built-in packages to ${elpa:Depends} if they are also packaged
diff --git a/emacsen-common/remove b/emacsen-common/remove
index d09371e..56ba5b6 100755
--- a/emacsen-common/remove
+++ b/emacsen-common/remove
@@ -18,7 +18,8 @@ case $FLAVOR in
         exit 0
         ;;
     xemacs*)
-           echo remove/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOUR}
+        echo remove/${ELPA_DIR}: Skipping unsupported emacs ${FLAVOUR}
+	exit 0
         ;;
     *)
         echo remove/${ELPA_DIR}: Handling removal of emacsen flavor ${FLAVOR}