[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-8-9-g21745f1

[Thomas Preud'homme]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=21745f1

The following commit has been merged in the experimental branch:
commit 21745f168ce45641ef369f6f3f4f8a29ef9383dc
Author: Thomas Preud'homme <robotux at celest.fr>
Date:   Tue Jan 8 11:18:09 2013 +0100

    Really remove alternatives on upgrade
    
    Remove alternatives on upgrade when upgrading from a version << 4:4.8.5.
    Logic is moved to preinst since the prerm invoked by dpkg is the one of
    the package upgraded from.
---
 debian/libqt4-dev-bin.preinst     |   14 ++++++++++++++
 debian/libqt4-dev-bin.prerm       |    3 ++-
 debian/qt4-designer.preinst       |   13 +++++++++++++
 debian/qt4-designer.prerm         |    3 ++-
 debian/qt4-dev-tools.preinst      |   14 ++++++++++++++
 debian/qt4-dev-tools.prerm        |    3 ++-
 debian/qt4-linguist-tools.preinst |   14 ++++++++++++++
 debian/qt4-linguist-tools.prerm   |    3 ++-
 debian/qt4-qmake.preinst          |   13 +++++++++++++
 debian/qt4-qmake.prerm            |    3 ++-
 debian/qt4-qtconfig.preinst       |   13 +++++++++++++
 debian/qt4-qtconfig.prerm         |    3 ++-
 12 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/debian/libqt4-dev-bin.preinst b/debian/libqt4-dev-bin.preinst
new file mode 100644
index 0000000..cc1b87b
--- /dev/null
+++ b/debian/libqt4-dev-bin.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove moc "/usr/bin/moc-qt4"
+            update-alternatives --remove uic "/usr/bin/uic-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/libqt4-dev-bin.prerm b/debian/libqt4-dev-bin.prerm
index dde1e75..d822876 100644
--- a/debian/libqt4-dev-bin.prerm
+++ b/debian/libqt4-dev-bin.prerm
@@ -3,7 +3,8 @@
 set -e
 
 case "$1" in
-    upgrade|remove|failed-upgrade|deconfigure)
+    upgrade) ;;
+    remove|failed-upgrade|deconfigure)
         update-alternatives --remove moc "/usr/bin/moc-qt4"
         update-alternatives --remove uic "/usr/bin/uic-qt4"
         ;;
diff --git a/debian/qt4-designer.preinst b/debian/qt4-designer.preinst
new file mode 100644
index 0000000..7e7a976
--- /dev/null
+++ b/debian/qt4-designer.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove designer "/usr/bin/designer-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-designer.prerm b/debian/qt4-designer.prerm
index 86bf6f1..4151fef 100644
--- a/debian/qt4-designer.prerm
+++ b/debian/qt4-designer.prerm
@@ -3,7 +3,8 @@
 set -e
 
 case "$1" in
-    upgrade|remove|failed-upgrade|deconfigure)
+    upgrade) ;;
+    remove|failed-upgrade|deconfigure)
         update-alternatives --remove designer "/usr/bin/designer-qt4"
         ;;
 esac
diff --git a/debian/qt4-dev-tools.preinst b/debian/qt4-dev-tools.preinst
new file mode 100644
index 0000000..6b3a304
--- /dev/null
+++ b/debian/qt4-dev-tools.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove assistant "/usr/bin/assistant-qt4"
+            update-alternatives --remove linguist "/usr/bin/linguist-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-dev-tools.prerm b/debian/qt4-dev-tools.prerm
index 5c158fc..c986ab3 100644
--- a/debian/qt4-dev-tools.prerm
+++ b/debian/qt4-dev-tools.prerm
@@ -3,7 +3,8 @@
 set -e
 
 case "$1" in
-    upgrade|remove|failed-upgrade|deconfigure)
+    upgrade) ;;
+    remove|failed-upgrade|deconfigure)
         update-alternatives --remove assistant "/usr/bin/assistant-qt4"
         update-alternatives --remove linguist "/usr/bin/linguist-qt4"
         ;;
diff --git a/debian/qt4-linguist-tools.preinst b/debian/qt4-linguist-tools.preinst
new file mode 100644
index 0000000..d1ef0b4
--- /dev/null
+++ b/debian/qt4-linguist-tools.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove lupdate "/usr/bin/lupdate-qt4"
+            update-alternatives --remove lrelease "/usr/bin/lrelease-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-linguist-tools.prerm b/debian/qt4-linguist-tools.prerm
index bbb5ad4..350c6eb 100644
--- a/debian/qt4-linguist-tools.prerm
+++ b/debian/qt4-linguist-tools.prerm
@@ -3,7 +3,8 @@
 set -e
 
 case "$1" in
-    upgrade|remove|failed-upgrade|deconfigure)
+    upgrade) ;;
+    remove|failed-upgrade|deconfigure)
         update-alternatives --remove lupdate "/usr/bin/lupdate-qt4"
         update-alternatives --remove lrelease "/usr/bin/lrelease-qt4"
         ;;
diff --git a/debian/qt4-qmake.preinst b/debian/qt4-qmake.preinst
new file mode 100644
index 0000000..41d0219
--- /dev/null
+++ b/debian/qt4-qmake.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove qmake "/usr/bin/qmake-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-qmake.prerm b/debian/qt4-qmake.prerm
index 426ec39..49cbd3d 100644
--- a/debian/qt4-qmake.prerm
+++ b/debian/qt4-qmake.prerm
@@ -3,7 +3,8 @@
 set -e
 
 case "$1" in
-    upgrade|remove|failed-upgrade|deconfigure)
+    upgrade) ;;
+    remove|failed-upgrade|deconfigure)
         update-alternatives --remove qmake "/usr/bin/qmake-qt4"
         ;;
 esac
diff --git a/debian/qt4-qtconfig.preinst b/debian/qt4-qtconfig.preinst
new file mode 100644
index 0000000..a043ed8
--- /dev/null
+++ b/debian/qt4-qtconfig.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-qtconfig.prerm b/debian/qt4-qtconfig.prerm
index 088ffda..c8fa85a 100644
--- a/debian/qt4-qtconfig.prerm
+++ b/debian/qt4-qtconfig.prerm
@@ -3,7 +3,8 @@
 set -e
 
 case "$1" in
-    upgrade|remove|failed-upgrade|deconfigure)
+    upgrade) ;;
+    remove|failed-upgrade|deconfigure)
         update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4"
         ;;
 esac

-- 
Qt 4 packaging