ocaml-mode: do not hardcode emacs flavours

diff --git a/debian/changelog b/debian/changelog
index 7dcb62e1b5808d08138677c5dc2ed7670c7f04bd..fef4010011ac88e7c3615d47d95888445c3170e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml (3.10.0-5) UNRELEASED; urgency=low
+ocaml (3.10.0-5) experimental; urgency=low
+  
+  [ Ralf Treinen ]
 
-  * NOT RELEASED YET
+  * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which
+    to compile ocaml-mode (closes: Bug#433082)
 
- -- Stefano Zacchiroli <zack@debian.org>  Wed, 04 Jul 2007 11:28:02 +0000
+ -- Ralf Treinen <treinen@debian.org>  Wed, 18 Jul 2007 18:31:31 +0200
 
 ocaml (3.10.0-4) experimental; urgency=low
 

diff --git a/debian/ocaml-mode.emacsen-install b/debian/ocaml-mode.emacsen-install
index bdd3f1bc90a214b7d18f6b5aab02dbba04f39e52..2512296611babe918d41d30dda9306c4d3a3e6cd 100644 (file)
--- a/debian/ocaml-mode.emacsen-install
+++ b/debian/ocaml-mode.emacsen-install
@@ -8,14 +8,7 @@
 FLAVOR=$1
 PACKAGE=ocaml-mode
 
-case ${FLAVOR} in
-    emacs20|emacs21|xemacs21|emacs-snapshot)
-       ;;
-    *)
-       echo install/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR}
-       exit 0
-       ;;
-esac
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
 
 echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
 
@@ -41,15 +34,14 @@ install -m 755 -d ${ELCDIR}
 
 cd ${ELDIR}
 case "${FLAVOR}" in
-    emacs20 | emacs21 | emacs-snapshot)
-       FILES=`ls *.el | grep -v caml-xemacs`
-       ;;
-
     xemacs21)
        FILES=`ls *.el | grep -v caml-emacs`
        ;;
+
     *)
-       ;;      
+       FILES=`ls *.el | grep -v caml-xemacs`
+       ;;
+
 esac
 cp ${FILES} ${ELCDIR}
 cd ${ELCDIR}

diff --git a/debian/ocaml-mode.emacsen-remove b/debian/ocaml-mode.emacsen-remove
index abc5bd3f61670c94d0fe972fad0cdf02b0b78547..1f168b3613cf06d155daed56487dae6b84d31da8 100644 (file)
--- a/debian/ocaml-mode.emacsen-remove
+++ b/debian/ocaml-mode.emacsen-remove
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+ #!/bin/sh -e
 # /usr/lib/emacsen-common/packages/remove/ocaml-mode
 
 FLAVOR=$1