[Pkg-urxvt-maintainers] [SCM] Git repository for pkg-urxvt branch, master, updated. debian/9.22-1-28-ge909968

[Ryan Kavanagh]

Gitweb-URL: http://git.debian.org/?p=pkg-kde//srv/git.debian.org/git/pkg-urxvt/pkg-urxvt.git;a=commitdiff;h=80b0a1f

The following commit has been merged in the master branch:
commit 80b0a1fd3114fd022bf68124c4f9fd8bb771690f
Author: Ryan Kavanagh <rak at debian.org>
Date:   Mon Jan 1 16:57:23 2018 -0500

    Drop rxvt alternative and install link directly
---
 debian/rxvt-unicode.links    |  2 ++
 debian/rxvt-unicode.postinst |  5 -----
 debian/rxvt-unicode.preinst  | 28 +++++++++++++++++++++-------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/debian/rxvt-unicode.links b/debian/rxvt-unicode.links
index 1114776..b020aa3 100644
--- a/debian/rxvt-unicode.links
+++ b/debian/rxvt-unicode.links
@@ -1,3 +1,5 @@
+usr/bin/urxvt usr/bin/rxvt
 usr/bin/urxvt usr/bin/rxvt-unicode
+usr/share/man/man1/urxvt.1.gz usr/share/man/man1/rxvt.1.gz
 usr/share/man/man1/urxvt.1.gz usr/share/man/man1/rxvt-unicode.1.gz
 usr/share/pixmaps/urxvt.xpm usr/share/pixmaps/urxvt_32x32.xpm
diff --git a/debian/rxvt-unicode.postinst b/debian/rxvt-unicode.postinst
index 5c6e17e..9c5bd42 100644
--- a/debian/rxvt-unicode.postinst
+++ b/debian/rxvt-unicode.postinst
@@ -4,11 +4,6 @@ set -e
 if [ "$1" = configure ]; then
 
     update-alternatives \
-        --install /usr/bin/rxvt \
-            rxvt /usr/bin/urxvt 30 \
-        --slave /usr/share/man/man1/rxvt.1.gz \
-            rxvt.1.gz /usr/share/man/man1/urxvt.1.gz
-    update-alternatives \
         --install /usr/bin/x-terminal-emulator \
             x-terminal-emulator /usr/bin/urxvt 20 \
         --slave /usr/share/man/man1/x-terminal-emulator.1.gz \
diff --git a/debian/rxvt-unicode.preinst b/debian/rxvt-unicode.preinst
index 678a38c..286a3a5 100644
--- a/debian/rxvt-unicode.preinst
+++ b/debian/rxvt-unicode.preinst
@@ -1,12 +1,26 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = upgrade ]; then
-    # clean up after old versions, unless the admin chose urxvtcd
-    if ! update-alternatives --query x-terminal-emulator | grep -q \
-            '^Value: /usr/bin/urxvtcd$'; then
-        update-alternatives --remove x-terminal-emulator /usr/bin/urxvtcd
-    fi
-fi
+case $1 in
+    upgrade)
+        # clean up after old versions, unless the admin chose urxvtcd
+        if ! update-alternatives --query x-terminal-emulator | grep -q \
+                '^Value: /usr/bin/urxvtcd$'; then
+            update-alternatives --remove x-terminal-emulator /usr/bin/urxvtcd
+        fi
+        if dpkg --compare-versions $2 lt 9.22-2; then
+            # Drop rxvt alternative: no longer needed and we provide the symlink
+            if update-alternatives --list rxvt >/dev/null; then
+                update-alternatives --remove-all rxvt
+            fi
+        fi
+    ;;
+    install)
+        # Drop rxvt alternative: no longer needed and we provide the symlink
+        if update-alternatives --list rxvt >/dev/null; then
+            update-alternatives --remove-all rxvt
+        fi
+;;
+esac
 
 #DEBHELPER#

-- 
Git repository for pkg-urxvt