[pkg-kde-commits] rev 2820 - in trunk/packages/qt4-x11/debian: . patches

Brian Nelson pyro at costa.debian.org
Wed Jan 11 03:20:48 UTC 2006 

Author: pyro
Date: 2006-01-11 03:20:47 +0000 (Wed, 11 Jan 2006)
New Revision: 2820

Added:
   trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch
Removed:
   trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/patches/00list
Log:
    the last version.  Also removed some unneeded dependencies.
  * debian/patches/10_qmake_for_debian: renamed from
    10_qmake_use_qt4_tools, and updated to remove the "link_prl" from the
    default qmake CONFIG line.  This disables the recursive linkage
    against all indirectly-used libraries. (Closes: #343190)
    - Fixes qmake problem with including bad build path (Closes: #327359)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-11 02:53:38 UTC (rev 2819)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-11 03:20:47 UTC (rev 2820)
@@ -14,7 +14,7 @@
   * debian/control: added explicit dependencies for libqt4-dev on the
     Source-Version packages libqt4-core, libqt4-gui, libqt4-sql, and
     libqt4-qt3support.  These dependencies were accidentally dropped in
-    the last version.
+    the last version.  Also removed some unneeded dependencies.
 
   * Split the *_debug.so symlinks out of libqt4-dev and into a separate
     libqt4-debug-dev package.  Made the libqt4-debug-dev package depend on
@@ -33,12 +33,18 @@
     suggested by Isaac Clerencia <isaac at debian.org>, to fix a FTBFS on
     alpha. (Closes: #347353)
 
- -- Brian Nelson <pyro at debian.org>  Tue, 10 Jan 2006 09:16:28 -0800
+  * debian/patches/10_qmake_for_debian: renamed from
+    10_qmake_use_qt4_tools, and updated to remove the "link_prl" from the
+    default qmake CONFIG line.  This disables the recursive linkage
+    against all indirectly-used libraries. (Closes: #343190)
 
+ -- Brian Nelson <pyro at debian.org>  Tue, 10 Jan 2006 18:02:53 -0800
+
 qt4-x11 (4.1.0-1) unstable; urgency=low
 
   * New upstream release
     - Fixes missing QBitArray operators (Closes: #341658)
+    - Fixes qmake problem with including bad build path (Closes: #327359)
   
   * Added the new QTestLib unit testing framework to the libqt4-core
     package

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2006-01-11 02:53:38 UTC (rev 2819)
+++ trunk/packages/qt4-x11/debian/control	2006-01-11 03:20:47 UTC (rev 2820)
@@ -9,7 +9,7 @@
 Package: libqt4-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, xlibs-static-pic, libpq-dev, libmysqlclient15-dev
+Depends: ${misc:Depends}, libqt4-core (= ${Source-Version}), libqt4-gui (= ${Source-Version}), libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, xlibs-static-pic
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
 Recommends: qt4-dev-tools
 Suggests: qt4-doc, libqt4-debug-dev

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2006-01-11 02:53:38 UTC (rev 2819)
+++ trunk/packages/qt4-x11/debian/patches/00list	2006-01-11 03:20:47 UTC (rev 2820)
@@ -1,4 +1,4 @@
-10_qmake_use_qt4_tools
+10_qmake_for_debian
 11_launch_assistant-qt4
 12_mips_atomic_ops
 13_arm_ftbfs_fixes

Copied: trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch (from rev 2817, trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch	2006-01-10 17:06:00 UTC (rev 2817)
+++ trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch	2006-01-11 03:20:47 UTC (rev 2820)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_qmake_use_qt4_tools.dpatch by Brian Nelson <pyro at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ensures qmake generates Makefiles that use the -qt4 tools and
+## DP: that use recursively link against all indirectly-used libraries.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.0~/mkspecs/linux-g++/qmake.conf qt4-x11-4.1.0/mkspecs/linux-g++/qmake.conf
+--- qt4-x11-4.1.0~/mkspecs/linux-g++/qmake.conf	2005-12-16 03:51:53.000000000 -0800
++++ qt4-x11-4.1.0/mkspecs/linux-g++/qmake.conf	2006-01-10 17:57:18.000000000 -0800
+@@ -4,7 +4,7 @@
+ 
+ MAKEFILE_GENERATOR	= UNIX
+ TEMPLATE		= app
+-CONFIG			+= qt warn_on release incremental link_prl
++CONFIG			+= qt warn_on release incremental
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
+@@ -68,8 +68,8 @@
+ QMAKE_LIBS_OPENGL_QT	= -lGL
+ QMAKE_LIBS_THREAD	= -lpthread
+ 
+-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc-qt4
++QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic-qt4
+ 
+ QMAKE_AR		= ar cqs
+ QMAKE_RANLIB		=

Deleted: trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch

More information about the pkg-kde-commits mailing list