Merge lp:~kklimonda/ubuntu/lucid/rxvt-unicode/lp-514821 into lp:ubuntu/lucid/rxvt-unicode

[Krzysztof Klimonda]

=== added file 'debian/NEWS.Debian'
--- debian/NEWS.Debian	1970-01-01 00:00:00 +0000
+++ debian/NEWS.Debian	2010-01-30 19:07:16 +0000
@@ -0,0 +1,12 @@
+rxvt-unicode (9.06-2) unstable; urgency=medium
+
+  * urxvtcd alternative removed
+
+    rxvt-unicode used to install the urxvtcd wrapper script as an
+    alternative for x-terminal-emulator; this is no longer the case.
+    If you do not have urxvtcd selected, it will be removed from the
+    alternatives system on upgrade. If you have selected urxvtcd as
+    x-terminal-emulator, it is strongly recommended that you switch to
+    plain urxvt.
+
+ -- Decklin Foster <[e-mail]>  Mon, 02 Nov 2009 11:11:44 -0500

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-02 13:43:36 +0000
+++ debian/changelog	2010-01-30 19:07:16 +0000
@@ -1,3 +1,20 @@
+rxvt-unicode (9.06-3ubuntu1) lucid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - apply patch to fix X "locking" on ctrl+middle mouse click
+    - Fix FTBFS caused by changes in glibc 2.10
+    - debian/control:
+      + change Maintainer to Ubuntu MOTU Developers
+
+ -- Krzysztof Klimonda <[e-mail]>  Sat, 30 Jan 2010 19:51:28 +0100
+
+rxvt-unicode (9.06-3) unstable; urgency=low
+
+  * Don't remove urxvtcd alternative if selected (Closes: #555310)
+  * Fix x-terminal-emulator priority for urxvt
+
+ -- Decklin Foster <[e-mail]>  Sun, 29 Nov 2009 22:00:45 -0500
+
 rxvt-unicode (9.06-2ubuntu1) lucid; urgency=low
  
   * apply patch to fix X "locking" on ctrl+middle mouse click (LP: #317366)

=== modified file 'debian/rxvt-unicode-base.postinst'
--- debian/rxvt-unicode-base.postinst	2009-11-02 11:11:44 +0000
+++ debian/rxvt-unicode-base.postinst	2010-01-30 19:07:16 +0000
@@ -4,12 +4,12 @@
 
     update-alternatives \
         --install /usr/bin/rxvt \
-            rxvt /usr/bin/urxvt 31 \
+            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 11 \
+            x-terminal-emulator /usr/bin/urxvt 20 \
         --slave /usr/share/man/man1/x-terminal-emulator.1.gz \
             x-terminal-emulator.1.gz /usr/share/man/man1/urxvt.1.gz
 

=== modified file 'debian/rxvt-unicode-base.preinst'
--- debian/rxvt-unicode-base.preinst	2009-11-02 11:11:44 +0000
+++ debian/rxvt-unicode-base.preinst	2010-01-30 19:07:16 +0000
@@ -1,8 +1,11 @@
 #!/bin/sh -e
 
 if [ "$1" = upgrade ]; then
-    # clean up after old versions
-    update-alternatives --remove x-terminal-emulator /usr/bin/urxvtcd
+    # 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
 
 #DEBHELPER#