Bug#846991: vm: diff for NMU version 8.2.0b-2.1

[Rob Browning]

Control: tags 846991 + patch
Control: tags 846991 + pending

Hi Manoj,

I've prepared an NMU for vm (versioned as 8.2.0b-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u vm-8.2.0b/debian/changelog vm-8.2.0b/debian/changelog
--- vm-8.2.0b/debian/changelog
+++ vm-8.2.0b/debian/changelog
@@ -1,3 +1,12 @@
+vm (8.2.0b-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Support emacs25.  Change build dependency from emacs24 to "emacs25-nox
+    | emacs25 | emacs24", and allow emacs25 as a flavor in the postinst
+    and postrm (Closes: #846991).
+
+ -- Rob Browning <r...@defaultvalue.org>  Sat, 07 Jan 2017 14:38:24 -0600
+
 vm (8.2.0b-2) unstable; urgency=low
 
   * Updated to standards version 3.9.6, no changes needed
diff -u vm-8.2.0b/debian/control vm-8.2.0b/debian/control
--- vm-8.2.0b/debian/control
+++ vm-8.2.0b/debian/control
@@ -6,7 +6,8 @@
 Priority: optional
 Maintainer: Manoj Srivastava <sriva...@debian.org>
 Standards-Version: 3.9.6
-Build-Depends-Indep: debhelper (>= 9.0.0), autotools-dev, emacs24,
+Build-Depends-Indep: debhelper (>= 9.0.0), autotools-dev,
+ emacs25-nox | emacs25 | emacs24,
  texinfo, texlive-latex-base, texlive-fonts-recommended
 
 Package: vm
diff -u vm-8.2.0b/debian/vm.postinst vm-8.2.0b/debian/vm.postinst
--- vm-8.2.0b/debian/vm.postinst
+++ vm-8.2.0b/debian/vm.postinst
@@ -186,7 +186,7 @@
     fi
 
     if which ucfr >/dev/null; then
-        for flavour in emacs24 emacs22 emacs23 emacs-snapshot xemacs21; do
+        for flavour in emacs25 emacs24 emacs22 emacs23 emacs-snapshot 
xemacs21; do
            STARTDIR=/etc/$flavour/site-start.d;
            STARTFILE="${package_name}-init.el";
             if [ -e "$STARTDIR/50$STARTFILE" ]; then
diff -u vm-8.2.0b/debian/vm.postrm vm-8.2.0b/debian/vm.postrm
--- vm-8.2.0b/debian/vm.postrm
+++ vm-8.2.0b/debian/vm.postrm
@@ -117,7 +117,7 @@
         rm -f -f $ELDIR/vm.elc
     fi
 
-    for flavour in emacs24 emacs22 emacs23 emacs-snapshot xemacs21; do
+    for flavour in emacs25 emacs24 emacs22 emacs23 emacs-snapshot xemacs21; do
         ELCDIR=/usr/share/$flavour/site-lisp/$package_name/
         if [ -f /etc/$flavour/site-start.d/50vm-init.el ]; then
             rm -f /etc/$flavour/site-start.d/50vm-init.el
@@ -136,7 +136,7 @@
 
     # This package has previously been removed and is now having
     # its configuration purged from the system.
-    for flavour in emacs24 emacs22 emacs23 emacs-snapshot xemacs21; do
+    for flavour in emacs25 emacs24 emacs22 emacs23 emacs-snapshot xemacs21; do
        STARTDIR=/etc/$flavour/site-start.d;
        STARTFILE="${package_name}-init.el";
         if which ucf >/dev/null; then