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

[Matthew Rosewarne]

Author: mukidohime-guest
Date: 2008-04-15 21:08:39 +0000 (Tue, 15 Apr 2008)
New Revision: 10146

Added:
   trunk/packages/qt4-x11/debian/watch
Modified:
   trunk/packages/qt4-x11/debian/changelog
Log:
* Add watch file


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-04-15 20:38:41 UTC (rev 10145)
+++ trunk/packages/qt4-x11/debian/changelog	2008-04-15 21:08:39 UTC (rev 10146)
@@ -18,8 +18,9 @@
   +++ Changes by Matthew Rosewarne:
 
   * Add Recommends: qt4-doc to qt4-demos.
+  * Add watch file.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Apr 2008 22:37:01 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Apr 2008 17:07:21 -0400
 
 qt4-x11 (4.4.0~rc1-3) unstable; urgency=low
 
@@ -1002,3 +1003,26 @@
   * Initial release (Closes: #306694)
 
  -- Brian Nelson <pyro at debian.org>  Tue,  5 Jul 2005 19:42:18 -0700
+qt4-x11 (4.4.0~rc1-4.1) unstable; urgency=low
+
+  +++ Changes by Sune Vuorela:
+
+  * Have libqt4-dev conflict/replace libqtwebkit-dev.
+  * Fix qmake to generate a bit better pkg-config files. Those should usually
+    not be generated - as it ends up being crackful. After a bit of patching
+    they are a bit less crackful though.
+  * Postprocess prl files to remove the same crack as in the pc files.
+  * Do a bit nicer linking when needed instead of relying on crackfulness from
+    prl and pc files.
+  * Add a disabled patch to generate better prl files, but unfortunately too
+    much of qt4 build process relies on on it and is not yet fixed, but it is
+    saved for later use.
+  * Fix qmake makefile generation - should not add double slashes to
+    makefiles.
+
+  +++ Changes by Matthew Rosewarne:
+
+  * Add Recommends: qt4-doc to qt4-demos.
+  * 
+
+ -- Matthew Rosewarne <mrosewarne at inoutbox.com>  Tue, 15 Apr 2008 17:07:21 -0400

Added: trunk/packages/qt4-x11/debian/watch
===================================================================
--- trunk/packages/qt4-x11/debian/watch	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/watch	2008-04-15 21:08:39 UTC (rev 10146)
@@ -0,0 +1,4 @@
+version=3
+
+opts=dversionmangle=s/~/-/ \
+ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-(.*)\.tar\.bz2 debian uupdate