--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package epix
(Please provide enough (but not too much) information to help
the release team to judge the request efficiently. E.g. by
filling in the sections below.)
[ Reason ]
(Explain what the reason for the unblock request is.)
To fix RC bug#987258: causes xemacs21 to fail to install and vice versa
[ Impact ]
(What is the impact for the user if the unblock isn't granted?)
The presence of this package will prevent installation of xemacs21 and
vice versa
[ Tests ]
(What automated or manual tests cover the affected code?)
I have manually installed xemacs21 and epix together on a machine
running Debian testing after applying this fix, but was unable to do
so before fixing it.
[ Risks ]
(Discussion of the risks involved. E.g. code is trivial or
complex, key package vs leaf package, alternatives available.)
Leaf package, change in packaging is small.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
(Anything else the release team should know.)
The three changes listed in d/changelog:
* The first is needed to fix the RC bug; the required scripts are now
generated automatically by dh_elpa or something similar during the
build process
* The second change is a fix for a bug discovered by building this on
a new machine with a merged /usr; autoconf checked for bash and
found it as /usr/bin/bash, which is in contravention of policy.
* The third change is to remove an empty lisp directory; it was
already empty in 1.2.19-1 but I hadn't noticed.
unblock epix/1.2.19-2
diff -Nru epix-1.2.19/debian/changelog epix-1.2.19/debian/changelog
--- epix-1.2.19/debian/changelog 2020-04-02 22:57:19.000000000 +0100
+++ epix-1.2.19/debian/changelog 2021-04-20 17:54:01.000000000 +0100
@@ -1,3 +1,15 @@
+epix (1.2.19-2) unstable; urgency=medium
+
+ * Remove old debian/epix.emacsen-* files which prevented dh-elpa from
+ working correctly (Closes: #987258)
+ * Force configure to use /bin/bash for bash, otherwise building on
+ systems with /bin being a symlink to /usr/bin leads to scripts with
+ the incompatible /usr/bin/bash as their interpreter
+ * Remove now-empty directory usr/share/emacs/site-lisp/epix from
+ debian/epix.dirs
+
+ -- Julian Gilbey <jdg@debian.org> Tue, 20 Apr 2021 17:54:01 +0100
+
epix (1.2.19-1) unstable; urgency=medium
* New upstream release
diff -Nru epix-1.2.19/debian/epix.dirs epix-1.2.19/debian/epix.dirs
--- epix-1.2.19/debian/epix.dirs 2020-04-02 22:57:19.000000000 +0100
+++ epix-1.2.19/debian/epix.dirs 2021-04-20 17:54:01.000000000 +0100
@@ -1,5 +1,4 @@
usr/bin
usr/lib
usr/include
-usr/share/emacs/site-lisp/epix
usr/share/bash-completion/completions
diff -Nru epix-1.2.19/debian/epix.emacsen-compat epix-1.2.19/debian/epix.emacsen-compat
--- epix-1.2.19/debian/epix.emacsen-compat 2020-04-02 22:57:19.000000000 +0100
+++ epix-1.2.19/debian/epix.emacsen-compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0
diff -Nru epix-1.2.19/debian/epix.emacsen-install epix-1.2.19/debian/epix.emacsen-install
--- epix-1.2.19/debian/epix.emacsen-install 2020-04-02 22:57:19.000000000 +0100
+++ epix-1.2.19/debian/epix.emacsen-install 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/epix
-
-# Written by Jim Van Zandt <jrv@vanzandt.mv.com>, borrowing heavily
-# from the install scripts for gettext by Santiago Vila
-# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
-
-FLAVOR=$1
-PACKAGE=epix
-
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-# SITEFLAG="-no-site-file"
-#else
-# SITEFLAG="--no-site-file"
-#fi
-FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-# Install-info-altdir does not actually exist.
-# Maybe somebody will write it.
-if test -x /usr/sbin/install-info-altdir; then
- echo install/${PACKAGE}: install Info links for ${FLAVOR}
- install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
-fi
-
-install -m 755 -d ${ELCDIR}
-cd ${ELDIR}
-FILES=`echo *.el`
-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
-
-exit 0
diff -Nru epix-1.2.19/debian/epix.emacsen-remove epix-1.2.19/debian/epix.emacsen-remove
--- epix-1.2.19/debian/epix.emacsen-remove 2020-04-02 22:57:19.000000000 +0100
+++ epix-1.2.19/debian/epix.emacsen-remove 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/epix
-
-FLAVOR=$1
-PACKAGE=epix
-
-if [ ${FLAVOR} != emacs ]; then
- if test -x /usr/sbin/install-info-altdir; then
- echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
- install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/epix.info.gz
- fi
-
- echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
- rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff -Nru epix-1.2.19/debian/rules epix-1.2.19/debian/rules
--- epix-1.2.19/debian/rules 2020-04-02 22:57:19.000000000 +0100
+++ epix-1.2.19/debian/rules 2021-04-20 17:54:01.000000000 +0100
@@ -20,6 +20,9 @@
ln -s /usr/share/misc/config.sub .
ln -s /usr/share/misc/config.guess .
+override_dh_auto_configure:
+ dh_auto_configure -- --with-bash=/bin/bash
+
execute_after_dh_auto_install:
-rm -rf $(CURDIR)/debian/epix/usr/share/doc/epix/notes
-rm -rf $(CURDIR)/debian/epix/usr/share/doc/epix/config
--- End Message ---