[Pkg-kde-commits] rev 1679 - trunk/packages/qt-x11-free/debian

Sun Sep 4 23:30:55 UTC 2005

Author: adeodato
Date: 2005-09-04 23:30:54 +0000 (Sun, 04 Sep 2005)
New Revision: 1679

Modified:
   trunk/packages/qt-x11-free/debian/README.Debian
   trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst
   trunk/packages/qt-x11-free/debian/rules
Log:
Miscellaneous changes from Christopher.


Modified: trunk/packages/qt-x11-free/debian/README.Debian
===================================================================

--- trunk/packages/qt-x11-free/debian/README.Debian	2005-09-04 23:28:25 UTC (rev 1678)
+++ trunk/packages/qt-x11-free/debian/README.Debian	2005-09-04 23:30:54 UTC (rev 1679)
@@ -1,7 +1,6 @@
 Qt for Debian README
 --------------------
 
-
 1. Preface
 
 This README is intended to give developers and users exact information
@@ -44,7 +43,7 @@
 - the library is called libqt.so and is placed under /usr/lib. 
 - the plugins built with this version are always using the extension 
   <plugin>-non-mt.so, to indicate that they are to be used with the non-mt 
- (multithreaded) version. The plugins itself will install into the same 
+  (multithreaded) version. The plugins itself will install into the same 
   directory where the threaded version is placing its plugins too, so 
   that applications will all find the Qt plugins independed of the 
   version of Qt that they make use of. 
@@ -80,7 +79,6 @@
 same, defaulting on the threaded version). The library itself is called 
 libqt-mt.so and is to be found under /usr/lib.
  
-
 c) common build configuration
 
 As far as the common build configuration goes, we note explicitely that the 
@@ -133,7 +131,6 @@
 please visit http://www.trolltech.com and have a read at 
 http://doc.trolltech.com/3.0/sql-driver.html.
   
-
 3. Packages (End-User) 
 
 The Qt built has been split up into several packages that allow for easy 
@@ -158,7 +155,6 @@
 libqt3-mt-mysql
 libqt3-mt-psql 
 
-
 In addition to the libraries, it may make sense to install the program 
 qtconfig to customize the look and behaviorof Qt programs. If you have KDE 
 installed, the KDE control center will take this task automatically in most 
@@ -177,7 +173,6 @@
 that, please look at the examples, documentation and the code in designer or
 assistant as well as qtconfig.
 
-
 4. Packages (Package maintainers)
 
 In addition to the library, a package maintainer will require an additional 
@@ -195,31 +190,23 @@
 qt3-dev-tools  (this package contains the tools uic and moc as well as 
 qmake, required for building Qt applications) 
 
-
 If, however, you encounter an older program not to compile with this set 
 read the FAQ at the end of this document.
 
-
-
 5. Packages (Developers)
 
 In addition to the packages that packagers require, a developer usually 
 will require the Qt API documentationas well as tools like the assistant, 
 linguist or designer. However, you should be fine with installing the API 
 documentation that you can browse with a webbrowser, optionally with the 
-assistant.For a regular development environment, install qt3-designer
-qt3-doc
+assistant. They are available in /usr/share/doc/qt3-doc/html.
+For a regular development environment, install qt3-designer and qt3-doc.
 
-
 For faciliating Qt's extended environment to write plugins for the Qt 
 Designer or extend the Designer as well as utilizing the Qt Assistant by 
-calling it from within your program, install
+calling it from within your program, install qt3-apps-dev, which contains
+the static libraries and header files required for this functionality.
 
-qt3-apps-dev
-
-which contains the static libraries and header files required for this 
-functionality.
-
 For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and 
 makeqpf (embedded fonts tool)have been packaged into 
 qt3-dev-tools-embedded. For developers that work on migrating their program 
@@ -229,7 +216,6 @@
 For using the QTranslator class and where to find the qm-file for qt as 
 well as where to place your translations,see the next section.
 
-
 If your program doesn't compile with those settings in case you have 
 started your project with Qt 1.x or 2.x, please read the FAQ section at the 
 end of this document.
@@ -247,9 +233,9 @@
 
 .qmake.cache files are delivered with libqt3-dev and libqt3-mt-dev. They are 
 shipped as .qmake.cache in /usr/share/qt3/.qmake.cache, which makes sense
-as they are build-dependent and the -dev packages are conflicting anyway, so in case you need
-them for building Qt examples or other packages provided by Trolltech
-relying on the configuration that Qt was build with, use these file
+as they are build-dependent and the -dev packages are conflicting anyway, so
+in case you need them for building Qt examples or other packages provided by
+Trolltech relying on the configuration that Qt was build with, use these file
 as required by your package.
 
 5. Packages (Translators)
@@ -300,12 +286,8 @@
         // use a substitue for $prefix/share/appname/translations here      
         app.installTranslator( &myapp );
 
-
-
-
 6. Frequently Asked Questions
 
-
 Using Qt for Debian as a developer or packager 
 ----------------------------------------------
 
@@ -323,7 +305,6 @@
 Debian. As a packager, export thosetwo variables in the rules file before 
 calling qmake.
 
-
 Q: I have an application that when linking gives me symbol referencing 
 errors to Q*Style. Why does my applicationnot link correctly ?
 
@@ -383,4 +364,3 @@
  -- Ralf Nolden <nolden at kde.org>  Sun, 26 Jan 2003 20:39:19 +0100
  -- Ralf Nolden <nolden at kde.org>  Mon,  1 Sep 2003 19:24:16 +0200
     * update for qt-3.2.1
-

Modified: trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst
===================================================================
--- trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst	2005-09-04 23:28:25 UTC (rev 1678)
+++ trunk/packages/qt-x11-free/debian/qt3-dev-tools.postinst	2005-09-04 23:30:54 UTC (rev 1679)
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 
 set -e
 
@@ -11,7 +11,7 @@
         /usr/bin/uic uic "/usr/bin/uic-qt3" "45" \
 	--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" "45" \
 	--slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-09-04 23:28:25 UTC (rev 1678)
+++ trunk/packages/qt-x11-free/debian/rules	2005-09-04 23:30:54 UTC (rev 1679)
@@ -11,8 +11,8 @@
 OLD_PATH := $(PATH)
 export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
-DEB_HOST_ARCH     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 # dpatch stuff
 include /usr/share/dpatch/dpatch.make
@@ -118,14 +118,13 @@
 	make -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
 	make INSTALL_ROOT=$(TMP_INSTALL) install
 	make INSTALL_ROOT=$(TMP_INSTALL) plugins-install
-	
+
 	# archives get accidentally stripped by make install. Copy over unstripped ones for now.
 	cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
 
 	cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
 	cp bin/qt20fix $(TMP_INSTALL)/usr/bin/
 	cp bin/findtr $(TMP_INSTALL)/usr/bin/
-
 	# build conv2ui
 	cd tools/designer/tools/conv2ui && make
 	cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
@@ -137,7 +136,7 @@
 	# install qmake.cache file
 	install -d $(P_QTMTDEV)/usr/share/qt3/
 	cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache
-	
+
 	# install qconfig.h for the mt
 	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
 	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h
@@ -165,7 +164,11 @@
 
 	-rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
 		config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
-		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl
+		src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
+		config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
+		config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
+		config.tests/unix/endian/endiantest lib/qt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
+		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
 
 	# delete generated Makefiles but save the toplevel Makefile
 	-mv Makefile Makefile.save
@@ -185,10 +188,10 @@
 	dh_installdirs
 
 	# fix .prl files
-	for a in debian/tmp-install/usr/lib/*prl; do cat "$$a" | sed \
+	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
 	"s#$(QTDIR)#/usr/share/qt3#g" > "$$a".new && mv "$$a".new "$$a"; done
 
-	dh_install $(IBASE) --sourcedir=debian/tmp-install
+	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
 
 	## build qt3-doc package
 	# copy all docs there first
@@ -302,9 +305,9 @@
 	rm -rf `pwd`/debian/qt3-apps-dev/usr/include/qt3/preferences.ui.h
 	
 	## qvfb package
-	install -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/qt3-dev-tools-embedded/etc/qt3/qvfb/pda.skin
-	install -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
-	install -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
+	install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/qt3-dev-tools-embedded/etc/qt3/qvfb/pda.skin
+	install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
+	install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
 	
 	# remove utterly ugle symlink
 	rm -rf `pwd`/debian/qt3-dev-tools//usr/share/qt3/mkspecs/linux-g++/linux-g++


