[mutt] 05/07: Remove update-alternatives support for /usr/bin/mutt

[Faidon Liambotis]

This is an automated email from the git hooks/post-receive script.

paravoid pushed a commit to branch experimental
in repository mutt.

commit fd1a5ea0e9653473632af8ef8ae3bcc87c8b3161
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Tue Jul 5 17:58:57 2016 +0300

    Remove update-alternatives support for /usr/bin/mutt
    
    ...and its associated manpages and docs. This only existed for the benefit of
    mutt-patched and mutt-kz and is thus moot now.
---
 debian/changelog              |  3 +++
 debian/mutt.docs              |  1 +
 debian/mutt.install           |  2 +-
 debian/mutt.lintian-overrides |  5 -----
 debian/mutt.manpages          |  2 ++
 debian/mutt.postinst          | 15 ---------------
 debian/mutt.preinst           | 11 +++++++++++
 debian/mutt.prerm             | 13 -------------
 debian/rules                  |  8 +-------
 9 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b778f4..0ceca81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ mutt (1.6.1-2) experimental; urgency=medium
   * Similarly, fold mutt-kz, a binary from a different source package until
     now, into mutt. mutt-kz upstream has joined forces with NeoMutt, so this
     is now a matter of just passing --enable-notmuch to our ./configure.
+  * Remove update-alternatives support for /usr/bin/mutt and associated
+    manpages and docs. This only existed for the benefit of mutt-patched and
+    mutt-kz and is thus moot now.
   * Update neomutt to a newer version, 20160611.
     - Enable *all* the neomutt patches now, not just a hand-picked selection.
     - Use the single patch, as the broken out patches conflict with each
diff --git a/debian/mutt.docs b/debian/mutt.docs
index 67c08b9..ba9980d 100644
--- a/debian/mutt.docs
+++ b/debian/mutt.docs
@@ -1,4 +1,5 @@
 debian/extra/README.SMIME
+debian/tmp/usr/share/doc/mutt/manual.txt
 debian/tmp/usr/share/doc/mutt/NEWS
 debian/tmp/usr/share/doc/mutt/NEWS.old
 debian/tmp/usr/share/doc/mutt/TODO
diff --git a/debian/mutt.install b/debian/mutt.install
index 12d783a..87b43f6 100644
--- a/debian/mutt.install
+++ b/debian/mutt.install
@@ -16,4 +16,4 @@ contrib/smime.rc			etc/Muttrc.d
 debian/extra/rc/*.rc			etc/Muttrc.d
 debian/extra/mutt.xpm			usr/share/pixmaps
 debian/extra/mutt.desktop		usr/share/applications
-debian/tmp/usr/share/doc/mutt/*.html		usr/share/doc/mutt/html-org
+debian/tmp/usr/share/doc/mutt/*.html	usr/share/doc/mutt/html
diff --git a/debian/mutt.lintian-overrides b/debian/mutt.lintian-overrides
index 834cdb2..1131afe 100644
--- a/debian/mutt.lintian-overrides
+++ b/debian/mutt.lintian-overrides
@@ -1,7 +1,2 @@
 mutt: setgid-binary usr/bin/mutt_dotlock 2755 root/mail
 mutt: arch-dep-package-has-big-usr-share
-mutt: menu-command-not-in-package usr/share/menu/mutt:5 usr/bin/mutt
-mutt: desktop-command-not-in-package usr/share/applications/mutt.desktop mutt
-mutt: doc-base-file-references-missing-file mutt:9 /usr/share/doc/mutt/manual.txt.gz
-mutt: doc-base-file-references-missing-file mutt:12 /usr/share/doc/mutt/html/manual.html
-mutt: doc-base-file-references-missing-file mutt:13 /usr/share/doc/mutt/html/*
diff --git a/debian/mutt.manpages b/debian/mutt.manpages
index e2486bf..3c80bcf 100644
--- a/debian/mutt.manpages
+++ b/debian/mutt.manpages
@@ -1,4 +1,6 @@
+debian/tmp/usr/share/man/man1/mutt.1
 debian/tmp/usr/share/man/man1/mutt_dotlock.1
+debian/tmp/usr/share/man/man5/muttrc.5
 debian/tmp/usr/share/man/man1/smime_keys.1
 debian/tmp/usr/share/man/man5/mbox.5
 debian/tmp/usr/share/man/man5/mmdf.5
diff --git a/debian/mutt.postinst b/debian/mutt.postinst
deleted file mode 100644
index 4a0f43a..0000000
--- a/debian/mutt.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-	update-alternatives --install /usr/bin/mutt mutt /usr/bin/mutt-org 50 \
-		--slave /usr/share/man/man1/mutt.1.gz mutt.1.gz /usr/share/man/man1/mutt-org.1.gz \
-		--slave /usr/share/man/man5/muttrc.5.gz muttrc.5.gz /usr/share/man/man5/muttrc-org.5.gz \
-		--slave /usr/share/doc/mutt/html mutt-doc-html /usr/share/doc/mutt/html-org \
-		--slave /usr/share/doc/mutt/manual.txt.gz mutt-doc-manual /usr/share/doc/mutt/manual-org.txt.gz
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mutt.preinst b/debian/mutt.preinst
new file mode 100644
index 0000000..4e9f0e7
--- /dev/null
+++ b/debian/mutt.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt "1.6.1-2" ; then
+	update-alternatives --remove-all mutt
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/mutt.prerm b/debian/mutt.prerm
deleted file mode 100644
index 61b0c85..0000000
--- a/debian/mutt.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-	remove|deconfigure)
-		update-alternatives --remove mutt /usr/bin/mutt-org
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index f355d08..9f28b73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,13 +47,7 @@ override_dh_install:
 	  cat debian/extra/rc/Muttrc.foot ) > debian/tmp/Muttrc
 	
 	dh_install
-	
-	# prepare files for update-alternatives
-	mv debian/mutt/usr/bin/mutt debian/mutt/usr/bin/mutt-org
-	install -D debian/tmp/usr/share/man/man1/mutt.1 debian/mutt/usr/share/man/man1/mutt-org.1
-	install -D debian/tmp/usr/share/man/man5/muttrc.5 debian/mutt/usr/share/man/man5/muttrc-org.5
-	install -D debian/tmp/usr/share/doc/mutt/manual.txt debian/mutt/usr/share/doc/mutt/manual-org.txt
-	
+
 override_dh_strip:
 	dh_strip -O--dbgsym-migration='mutt-dbg (<< 1.6.1.2~)'
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git