[mutt] 03/16: Remove transitional code from too old versions

[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 89bac785dab6ba5e7fd8b7a545b78488e8d7ee27
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Sun Jul 3 22:36:13 2016 +0300

    Remove transitional code from too old versions
    
    * Remove postinst code that handles migrations from pre-1.5.20-9 versions,
      as it's too old (even wheezy shipped with 1.5.21-6.2).
    * Remove Conflicts/Replaces mutt-utf8, it was last shipped with version
      1.5.5.1-20040105+1, released over 12 years ago.
---
 debian/changelog             | 4 ++++
 debian/control               | 2 --
 debian/mutt-patched.postinst | 6 ------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2bc61a8..19222bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 mutt (1.6.1-2) UNRELEASED; urgency=medium
 
   * Add myself to Uploaders.
+  * Remove postinst code that handles migrations from pre-1.5.20-9 versions,
+    as it's too old (even wheezy shipped with 1.5.21-6.2).
+  * Remove Conflicts/Replaces mutt-utf8, it was last shipped with version
+    1.5.5.1-20040105+1, released over 12 years ago.
 
  -- Faidon Liambotis <paravoid at debian.org>  Sun, 03 Jul 2016 22:32:37 +0200
 
diff --git a/debian/control b/debian/control
index 9116f92..2e68fc8 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: locales, mime-support, libsasl2-modules
 Suggests: default-mta | mail-transport-agent, urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates
 Provides: mail-reader, imap-client
-Conflicts: mutt-utf8
-Replaces: mutt-utf8
 Description: text-based mailreader supporting MIME, GPG, PGP and threading
  Mutt is a sophisticated text-based Mail User Agent. Some highlights:
  .
diff --git a/debian/mutt-patched.postinst b/debian/mutt-patched.postinst
index dddfc41..75de4f0 100644
--- a/debian/mutt-patched.postinst
+++ b/debian/mutt-patched.postinst
@@ -3,12 +3,6 @@
 set -e
 
 if [ "$1" = "configure" ] ; then
-	# versions prior to 1.5.20-9 used dpkg-divert instead of update-alternatives
-	if [ "$2" ] && dpkg --compare-versions "$2" lt "1.5.20-9" ; then
-		dpkg-divert --remove --package mutt-patched --rename \
-			--divert /usr/bin/mutt.org /usr/bin/mutt
-	fi
-
 	update-alternatives --install /usr/bin/mutt mutt /usr/bin/mutt-patched 60 \
 		--slave /usr/share/man/man1/mutt.1.gz mutt.1.gz /usr/share/man/man1/mutt-patched.1.gz \
 		--slave /usr/share/man/man5/muttrc.5.gz muttrc.5.gz /usr/share/man/man5/muttrc-patched.5.gz \

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