rev 6011 - in branches/kde4/packages/qt4-x11/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-05-01 11:07:20 +0000 (Tue, 01 May 2007)
New Revision: 6011

Removed:
   branches/kde4/packages/qt4-x11/debian/patches/04_utf8_bug_fix.dpatch
   branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
Modified:
   branches/kde4/packages/qt4-x11/debian/changelog
   branches/kde4/packages/qt4-x11/debian/libqt4-core.install
   branches/kde4/packages/qt4-x11/debian/libqt4-dev.install
   branches/kde4/packages/qt4-x11/debian/rules
Log:
Update to qt4 snapshot


Modified: branches/kde4/packages/qt4-x11/debian/changelog
===================================================================
--- branches/kde4/packages/qt4-x11/debian/changelog	2007-05-01 10:58:54 UTC (rev 6010)
+++ branches/kde4/packages/qt4-x11/debian/changelog	2007-05-01 11:07:20 UTC (rev 6011)
@@ -1,3 +1,16 @@
+qt4-x11 (4.3~beta~snapshot-20070424-1) unstable; urgency=low
+
+  * New upstream release
+    + Remove the utf8 security patch. Applied upstream
+    + Remove the 30_arm_ftbfs patch - seems to be worked around upstream
+    + Upstream now installs pkgconfig files the right place. Fix
+    libqt4-dev.install to reflect this
+    + there is a libQtScript.so.* now. Ship it in libqt4-core currently
+  * Add utils.mk to rules file so we can use debian/rules list-missing
+  * There is currently no versioned changes file shipped by upstream
+
+ -- Sune Vuorela <debian at pusling.com>  Tue, 01 May 2007 00:33:02 +0200
+
 qt4-x11 (4.2.3-1) unstable; urgency=low
 
   * New upstream release

Modified: branches/kde4/packages/qt4-x11/debian/libqt4-core.install
===================================================================
--- branches/kde4/packages/qt4-x11/debian/libqt4-core.install	2007-05-01 10:58:54 UTC (rev 6010)
+++ branches/kde4/packages/qt4-x11/debian/libqt4-core.install	2007-05-01 11:07:20 UTC (rev 6011)
@@ -3,5 +3,6 @@
 usr/lib/libQtXml.so.*
 usr/lib/libQtTest.so.*
 usr/lib/libQtDBus.so.*
+usr/lib/libQtScript.so.*
 usr/bin/qdbus
 usr/share/qt4/translations/*.qm

Modified: branches/kde4/packages/qt4-x11/debian/libqt4-dev.install
===================================================================
--- branches/kde4/packages/qt4-x11/debian/libqt4-dev.install	2007-05-01 10:58:54 UTC (rev 6010)
+++ branches/kde4/packages/qt4-x11/debian/libqt4-dev.install	2007-05-01 11:07:20 UTC (rev 6011)
@@ -2,7 +2,7 @@
 usr/lib/*.a
 usr/lib/*.so
 usr/lib/*.prl
-usr/lib/*.pc usr/lib/pkgconfig/
+usr/lib/pkgconfig/
 usr/share/qt4/q3porting.xml
 usr/share/qt4/mkspecs/*
 usr/bin/qmake-qt4

Deleted: branches/kde4/packages/qt4-x11/debian/patches/04_utf8_bug_fix.dpatch

Deleted: branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch

Modified: branches/kde4/packages/qt4-x11/debian/rules
===================================================================
--- branches/kde4/packages/qt4-x11/debian/rules	2007-05-01 10:58:54 UTC (rev 6010)
+++ branches/kde4/packages/qt4-x11/debian/rules	2007-05-01 11:07:20 UTC (rev 6011)
@@ -7,6 +7,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_MAKE_INVOKE := $(MAKE)
 DEB_MAKE_BUILD_TARGET := sub-src sub-tools 
@@ -20,7 +21,7 @@
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 
-DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.3
+#DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.3
 
 ifeq ($(DEB_HOST_ARCH),arm)
 	EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT