rev 7019 - trunk/packages/qt4-x11/debian

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-08-09 11:58:31 +0000 (Thu, 09 Aug 2007)
New Revision: 7019

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/qt4-designer.menu
   trunk/packages/qt4-x11/debian/qt4-dev-tools.menu
   trunk/packages/qt4-x11/debian/qt4-qtconfig.menu
   trunk/packages/qt4-x11/debian/rules
Log:
* Update menu files.
* Fix some lintian warnings.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-08-09 10:19:33 UTC (rev 7018)
+++ trunk/packages/qt4-x11/debian/changelog	2007-08-09 11:58:31 UTC (rev 7019)
@@ -1,9 +1,11 @@
 qt4-x11 (4.3.1-1) unstable; urgency=low
 
-  [ Fathi Boudra ]
   * New upstream release.
+
+  [Fathi Boudra]
   * Switch to quilt patch system.
   * Update copyright. Add Trolltech GPL Exception.
+  * Update section in Debian menu files.
   * Update patches for Qt4.3.1.
   * Remove 51_kfreebsd_mkspecs patch. Moved in rules.
   * Add 0187-fix-font-fixed-pitch patch:
@@ -18,11 +20,11 @@
   * Disable 0172-prefer-xrandr-over-xinerama patch. (Closes: #433931)
   * Enable 0182-argb-visuals-default patch.
 
-  [ Sune Vuorela ]
+  [Sune Vuorela]
   * Add a quick and dirty test to make build on hppa fail if a current
     getdents kernel bug is detected.
 
- -- Sune Vuorela <debian at pusling.com>  Thu, 09 Aug 2007 12:17:01 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Wed, 08 Aug 2007 15:08:11 +0200
 
 qt4-x11 (4.3.0-5) unstable; urgency=low
 

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2007-08-09 10:19:33 UTC (rev 7018)
+++ trunk/packages/qt4-x11/debian/control	2007-08-09 11:58:31 UTC (rev 7019)
@@ -111,7 +111,7 @@
 Package: qt4-dev-tools
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
 Recommends: libqt4-dev, qt4-doc, qt4-designer
 Description: Qt 4 development tools

Modified: trunk/packages/qt4-x11/debian/qt4-designer.menu
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-designer.menu	2007-08-09 10:19:33 UTC (rev 7018)
+++ trunk/packages/qt4-x11/debian/qt4-designer.menu	2007-08-09 11:58:31 UTC (rev 7019)
@@ -1,6 +1,6 @@
 ?package(qt4-designer):\
 	needs="x11"\
-	section="Apps/Programming"\
+	section="Applications/Programming"\
 	hints="KDE"\
 	title="Qt Designer"\
 	command="/usr/bin/designer-qt4"

Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.menu
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.menu	2007-08-09 10:19:33 UTC (rev 7018)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.menu	2007-08-09 11:58:31 UTC (rev 7019)
@@ -1,13 +1,13 @@
 ?package(qt4-dev-tools):\
 	needs="x11"\
-	section="Apps/Tools"\
+	section="Applications/Programming"\
 	hints="KDE"\
 	title="Qt Assistant"\
 	command="/usr/bin/assistant-qt4"
 
 ?package(qt4-dev-tools):\
 	needs="x11"\
-	section="Apps/Programming"\
+	section="Applications/Programming"\
 	hints="KDE"\
 	title="Qt Linguist"\
 	command="/usr/bin/linguist-qt4"

Modified: trunk/packages/qt4-x11/debian/qt4-qtconfig.menu
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-qtconfig.menu	2007-08-09 10:19:33 UTC (rev 7018)
+++ trunk/packages/qt4-x11/debian/qt4-qtconfig.menu	2007-08-09 11:58:31 UTC (rev 7019)
@@ -1,6 +1,6 @@
 ?package(qt4-qtconfig):\
 	needs="x11"\
-	section="Apps/System"\
+	section="Applications/System"\
 	title="QtConfig"\
 	longtitle="Qt Configuration Utility"\
 	hints="Qt4 config tool"\

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2007-08-09 10:19:33 UTC (rev 7018)
+++ trunk/packages/qt4-x11/debian/rules	2007-08-09 11:58:31 UTC (rev 7019)
@@ -37,18 +37,19 @@
 
 common-configure-arch::
 ifeq ($(DEB_HOST_ARCH),hppa)
-       mkdir -p debian/hppa-tmp
-       echo "Testing wether getdents kernel bug is present on this buildd - see #433768"
-       gcc -o debian/hppa-tmp/hppa-test-program debian/readdir-hppa-test.c
-       cd $(CURDIR)/doc/html && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out
-       cd $(CURDIR)/doc/html && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out
-       @if ! diff -q $(CURDIR)/debian/hppa-tmp/readdir_r-out $(CURDIR)/debian/hppa-tmp/ls-a-out ; \
-       then  \
-               echo "Kernel bug present. This will misbuild qt4 if proceeding. Failing" ; \
-               echo "Please update kernel and test again" ; \
-               exit 5 ; \
-       fi
+        mkdir -p debian/hppa-tmp
+        echo "Testing whether getdents kernel bug is present on this buildd - see #433768"
+        gcc -o debian/hppa-tmp/hppa-test-program debian/readdir-hppa-test.c
+        cd $(CURDIR)/doc/html && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out
+        cd $(CURDIR)/doc/html && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out
+        @if ! diff -q $(CURDIR)/debian/hppa-tmp/readdir_r-out $(CURDIR)/debian/hppa-tmp/ls-a-out ; \
+        then \
+                echo "Kernel bug present. This will misbuild qt4 if proceeding. Failing" ; \
+                echo "Please update kernel and test again" ; \
+                exit 5 ; \
+        fi
 endif
+
 	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
 	# we cannot use directly linux-g++ due to src/corelib/io/io.pri
 	rm -rf mkspecs/glibc-g++
@@ -107,7 +108,7 @@
 
 	rm -rf lib/ plugins/ mkspecs/glibc-g++
 
-	#cleaning up after hppa tests
+	# cleaning up after hppa tests
 	rm -rf debian/hppa-tmp
 
 	find bin/ config.tests/ qmake/ -exec file {} \; | grep ELF | sed 's/:.*//'  | xargs rm -f
@@ -141,12 +142,12 @@
 
 binary-install/qt4-doc::
 # Tar up the examples to include them in qt4-doc
-	-$(MAKE) -k -C examples distclean
+	[ ! -f Makefile ] || $(MAKE) -k -C examples distclean
 	find examples/ -name '*.debug' -print0 | xargs -0r rm -f
 	tar -cv examples/ | \
 	gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-examples.tar.gz
 
-	-$(MAKE) -k -C demos distclean
+	[ ! -f Makefile ] || $(MAKE) -k -C demos distclean
 	find demos/ -name '*.debug' -print0 | xargs -0r rm -f
 	tar -cv demos/ | \
 	gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-demos.tar.gz