Package: riece-ndcc
Version: 1.0.8-1
Severity: normal

There is now emacs-snapshot in unstable repository. However,
riece-ndcc_1.0.8-1 fails with it.

Please see the attached patch.

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (95, 'testing'), (90, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.8-2-686
Locale: LANG=C, LC_CTYPE=C (charmap=EUC-JP) (ignored: LC_ALL set to ja_JP.eucJP)

Versions of packages riece-ndcc depends on:
ii  calc                          2.02f-23   An advanced calculator and mathema
ii  emacs21                       21.4a-1    The GNU Emacs editor
ii  riece                         1.0.8-1    an IRC client for Emacs

-- no debconf information
--- riece-1.0.8.orig.orig/debian/emacsen-install
+++ riece-1.0.8.orig/debian/emacsen-install
@@ -8,11 +8,6 @@
 FLAVOR=$1
 PACKAGE=riece-ndcc
 
-#if [ ${FLAVOR} = emacs ]; then exit 0; fi
-if [ ${FLAVOR} != emacs21 ]; 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"
@@ -21,6 +16,14 @@
 fi
 FLAGS="${SITEFLAG} -q -batch"
 
+if [ ${FLAVORTEST} = emacs -o ${FLAVORTEST} = xemacs ]; then exit 0; fi
+
+MAJOR_VERSION=`${FLAVOR} ${FLAGS} --eval '(message (format "%d" 
emacs-major-version))' 2>&1`
+
+if [ ${MAJOR_VERSION} -lt 21 ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
 ELDIR=/usr/share/emacs/site-lisp/riece
 ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
 

Reply via email to