[Pkg-kde-commits] rev 1313 - people/chrsmrtn/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-07-16 03:33:47 +0000 (Sat, 16 Jul 2005)
New Revision: 1313

Added:
   people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-assistant.prerm
   people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-linguist.prerm
   people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.prerm
Modified:
   people/chrsmrtn/qt-x11-free/debian/changelog
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm
   people/chrsmrtn/qt-x11-free/debian/rules
Log:
Qt4 co-existence patches from Brian Nelson.


Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/changelog	2005-07-16 03:33:47 UTC (rev 1313)
@@ -26,6 +26,9 @@
 
   * Add missing qvfbhdr.h. (Closes: #182366)
 
+  * Apply packaging patches from Brian Nelson to allow Qt3 to co-exist
+    with Qt4 packages. (Closes: #306879)
+
   * Bump libfreetype6-dev build-depends to >= 2.1.10 to work around API
     breakage.
 

Added: people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst	2005-07-16 03:33:47 UTC (rev 1313)
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/assistant-qt3 assistant "/usr/bin/assistant-qt3" "35" \
+	--slave /usr/share/man/man1/assistant.1.gz assistant.1.gz \
+	"/usr/share/man/man1/assistant-qt3.1.gz"
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-assistant.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-assistant.prerm	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-assistant.prerm	2005-07-16 03:33:47 UTC (rev 1313)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove assistant "/usr/bin/assistant-qt3"
+    ;;
+esac
+
+#DEBHELPER#

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst	2005-07-16 03:33:47 UTC (rev 1313)
@@ -11,5 +11,15 @@
         /usr/bin/uic uic "/usr/bin/uic-qt3" "35" \
 	--slave /usr/share/man/man1/uic.1.gz uic.1.gz \
 	"/usr/share/man/man1/uic-qt3.1.gz"
-			
+
+update-alternatives --install \
+        /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt3" "35" \
+	--slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
+	"/usr/share/man/man1/lupdate-qt3.1.gz"
+		
+update-alternatives --install \
+        /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt3" "35" \
+	--slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
+	"/usr/share/man/man1/lrelease-qt3.1.gz"
+		
 #DEBHELPER#

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm	2005-07-16 03:33:47 UTC (rev 1313)
@@ -7,6 +7,8 @@
   remove|failed-upgrade|deconfigure)
     update-alternatives --remove moc "/usr/bin/moc-qt3"
     update-alternatives --remove uic "/usr/bin/uic-qt3"
+    update-alternatives --remove lupdate "/usr/bin/lupdate-qt3"
+    update-alternatives --remove lrelease "/usr/bin/lrelease-qt3"
     ;;
 esac
 

Added: people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst	2005-07-16 03:33:47 UTC (rev 1313)
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/linguist-qt3 linguist "/usr/bin/linguist-qt3" "35" \
+	--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
+	"/usr/share/man/man1/linguist-qt3.1.gz"
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-linguist.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-linguist.prerm	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-linguist.prerm	2005-07-16 03:33:47 UTC (rev 1313)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove linguist "/usr/bin/linguist-qt3"
+    ;;
+esac
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst	2005-07-16 03:33:47 UTC (rev 1313)
@@ -0,0 +1,10 @@
+#!/bin/sh 
+
+set -e
+
+update-alternatives --install \
+	/usr/bin/qtconfig-qt3 qtconfig "/usr/bin/qtconfig-qt3" "35" \
+	--slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
+	"/usr/share/man/man1/qtconfig-qt3.1.gz"
+
+#DEBHELPER#

Added: people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.prerm	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.prerm	2005-07-16 03:33:47 UTC (rev 1313)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  upgrade) ;;
+  remove|failed-upgrade|deconfigure)
+    update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt3"
+    ;;
+esac
+
+#DEBHELPER#

Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules	2005-07-15 17:30:54 UTC (rev 1312)
+++ people/chrsmrtn/qt-x11-free/debian/rules	2005-07-16 03:33:47 UTC (rev 1313)
@@ -384,9 +384,16 @@
 	mv `pwd`/debian/qt3-designer/usr/bin/designer `pwd`/debian/qt3-designer/usr/bin/designer-qt3
 	mv `pwd`/debian/qt3-dev-tools/usr/bin/uic `pwd`/debian/qt3-dev-tools/usr/bin/uic-qt3
 	mv `pwd`/debian/qt3-dev-tools/usr/bin/moc `pwd`/debian/qt3-dev-tools/usr/bin/moc-qt3
+	mv `pwd`/debian/qt3-dev-tools/usr/bin/lupdate `pwd`/debian/qt3-dev-tools/usr/bin/lupdate-qt3
+	mv `pwd`/debian/qt3-dev-tools/usr/bin/lrelease `pwd`/debian/qt3-dev-tools/usr/bin/lrelease-qt3
+	mv `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig-qt3
+	mv `pwd`/debian/qt3-assistant/usr/bin/assistant `pwd`/debian/qt3-assistant/usr/bin/assistant-qt3
+	mv `pwd`/debian/qt3-linguist/usr/bin/linguist `pwd`/debian/qt3-linguist/usr/bin/linguist-qt3
 	install -D debian/maintain/man/designer.1 `pwd`/debian/qt3-designer/usr/share/man/man1/designer-qt3.1
 	install -D doc/man/man1/moc.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/moc-qt3.1
 	install -D doc/man/man1/uic.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/uic-qt3.1
+	install -D doc/man/man1/lrelease.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lrelease-qt3.1
+	install -D doc/man/man1/lupdate.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lupdate-qt3.1
 
 	dh_link -pqt3-designer usr/share/qt3/doc/html usr/share/doc/qt3-designer/html
 	dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html
@@ -406,7 +413,7 @@
 
 	# install the qmake binary
 	rm -rf `pwd`/debian/qt3-dev-tools/usr/bin/qmake
-	install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake
+	install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3
 
 	# Install source for the designer tools, such as createcw.
 	cp -ra tools/designer/tools debian/qt3-designer/usr/share/qt3/tools