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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-08-24 01:32:19 +0000 (Wed, 24 Aug 2005)
New Revision: 1545

Modified:
   people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links
   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/qt3-linguist.postinst
   people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst
   people/chrsmrtn/qt-x11-free/debian/rules
Log:
Major fixups to the Qt3/Qt4 cooperation. Everthing should
work now...


Modified: people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-assistant.postinst	2005-08-24 01:32:19 UTC (rev 1545)
@@ -3,8 +3,6 @@
 set -e
 
 update-alternatives --install \
-	/usr/bin/assistant-qt3 assistant "/usr/bin/assistant-qt3" "45" \
-	--slave /usr/share/man/man1/assistant.1.gz assistant.1.gz \
-	"/usr/share/man/man1/assistant-qt3.1.gz"
+	/usr/bin/assistant assistant "/usr/bin/assistant-qt3" "45" \
 
 #DEBHELPER#

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.links	2005-08-24 01:32:19 UTC (rev 1545)
@@ -1,7 +1,7 @@
 /usr/share/qt3/mkspecs/linux-g++ /usr/share/qt3/mkspecs/default
-/usr/bin/qmake /usr/share/qt3/bin/qmake
-/usr/bin/lupdate /usr/share/qt3/bin/lupdate
-/usr/bin/lrelease /usr/share/qt3/bin/lrelease
+/usr/bin/qmake-qt3 /usr/share/qt3/bin/qmake
+/usr/bin/lupdate-qt3 /usr/share/qt3/bin/lupdate
+/usr/bin/lrelease-qt3 /usr/share/qt3/bin/lrelease
 /usr/bin/uic-qt3 /usr/share/qt3/bin/uic
 /usr/bin/moc-qt3 /usr/share/qt3/bin/moc
 /usr/bin/qembed /usr/share/qt3/bin/qembed

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.postinst	2005-08-24 01:32:19 UTC (rev 1545)
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 
 set -e
 
@@ -21,5 +21,8 @@
         /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt3" "45" \
 	--slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
 	"/usr/share/man/man1/lrelease-qt3.1.gz"
-		
+
+update-alternatives --install \
+        /usr/bin/qmake qmake "/usr/bin/qmake-qt3" "45" \
+
 #DEBHELPER#

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-dev-tools.prerm	2005-08-24 01:32:19 UTC (rev 1545)
@@ -9,6 +9,7 @@
     update-alternatives --remove uic "/usr/bin/uic-qt3"
     update-alternatives --remove lupdate "/usr/bin/lupdate-qt3"
     update-alternatives --remove lrelease "/usr/bin/lrelease-qt3"
+    update-alternatives --remove qmake "/usr/bin/qmake-qt3"
     ;;
 esac
 

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-linguist.postinst	2005-08-24 01:32:19 UTC (rev 1545)
@@ -3,7 +3,7 @@
 set -e
 
 update-alternatives --install \
-	/usr/bin/linguist-qt3 linguist "/usr/bin/linguist-qt3" "45" \
+	/usr/bin/linguist linguist "/usr/bin/linguist-qt3" "45" \
 	--slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
 	"/usr/share/man/man1/linguist-qt3.1.gz"
 

Modified: people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/qt3-qtconfig.postinst	2005-08-24 01:32:19 UTC (rev 1545)
@@ -3,7 +3,7 @@
 set -e
 
 update-alternatives --install \
-	/usr/bin/qtconfig-qt3 qtconfig "/usr/bin/qtconfig-qt3" "45" \
+	/usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt3" "45" \
 	--slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
 	"/usr/share/man/man1/qtconfig-qt3.1.gz"
 

Modified: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules	2005-08-23 19:46:39 UTC (rev 1544)
+++ people/chrsmrtn/qt-x11-free/debian/rules	2005-08-24 01:32:19 UTC (rev 1545)
@@ -375,20 +375,24 @@
 	install -D `pwd`/src/attic.tar.gz `pwd`/debian/libqt3-compat-headers/usr/share/doc/libqt3-compat-headers/attic.tar.gz
 	rm -rf `pwd`/src/attic.tar.gz
 
-	# rename some binaries to make qt2/3 installations possible
+	# rename some binaries to make qt3/4 installations possible
 	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-dev-tools/usr/bin/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-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
+	install -D debian/maintain/man/qtconfig.1 `pwd`/debian/qt3-designer/usr/share/man/man1/qtconfig-qt3.1
+	install -D debian/maintain/man/linguist.1 `pwd`/debian/qt3-designer/usr/share/man/man1/linguist-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
@@ -399,9 +403,7 @@
 	dh_installman -pqt3-designer debian/maintain/man/createcw.1
 	dh_installman -pqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
 	dh_installman -pqt3-dev-tools-embedded debian/maintain/man/makeqpf.1 debian/maintain/man/qvfb.1
-	dh_installman -pqt3-dev-tools doc/man/man1/lupdate.1 doc/man/man1/lrelease.1 debian/maintain/man/qembed.1
-	dh_installman -pqt3-qtconfig debian/maintain/man/qtconfig.1
-	dh_installman -pqt3-linguist debian/maintain/man/linguist.1
+	dh_installman -pqt3-dev-tools debian/maintain/man/qembed.1
 
 	# copy README.Debian
 	for a in libqt3-mt-dev qt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done