rev 4828 - in trunk/packages/qt4-x11/debian: . patches

[Brian Nelson]

Author: pyro
Date: 2006-10-31 04:27:54 +0100 (Tue, 31 Oct 2006)
New Revision: 4828

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch
Log:
  * debian/patches/10_qmake_for_debian.dpatch: restored the modification
    to remove link_prl from the CONFIG line, which fixes problems with
    unnecessary linkage (Closes: #394836)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-10-31 03:23:00 UTC (rev 4827)
+++ trunk/packages/qt4-x11/debian/changelog	2006-10-31 03:27:54 UTC (rev 4828)
@@ -5,8 +5,12 @@
 
   * Added patches for hurd support (Closes: #380097)
 
- -- Brian Nelson <pyro at debian.org>  Mon, 30 Oct 2006 22:20:30 -0500
+  * debian/patches/10_qmake_for_debian.dpatch: restored the modification
+    to remove link_prl from the CONFIG line, which fixes problems with
+    unnecessary linkage (Closes: #394836)
 
+ -- Brian Nelson <pyro at debian.org>  Mon, 30 Oct 2006 22:27:45 -0500
+
 qt4-x11 (4.2.1-1) unstable; urgency=high
 
   * New upstream release    

Modified: trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch	2006-10-31 03:23:00 UTC (rev 4827)
+++ trunk/packages/qt4-x11/debian/patches/10_qmake_for_debian.dpatch	2006-10-31 03:27:54 UTC (rev 4828)
@@ -6,9 +6,9 @@
 ## DP: that use recursively link against all indirectly-used libraries.
 
 @DPATCH@
-diff -urNad qt4-x11-4.2.0~/mkspecs/common/linux.conf qt4-x11-4.2.0/mkspecs/common/linux.conf
---- qt4-x11-4.2.0~/mkspecs/common/linux.conf	2006-09-29 10:44:55.000000000 -0400
-+++ qt4-x11-4.2.0/mkspecs/common/linux.conf	2006-10-05 21:30:21.000000000 -0400
+diff -urNad qt4-x11-4.2.1~/mkspecs/common/linux.conf qt4-x11-4.2.1/mkspecs/common/linux.conf
+--- qt4-x11-4.2.1~/mkspecs/common/linux.conf	2006-10-20 11:35:09.000000000 -0400
++++ qt4-x11-4.2.1/mkspecs/common/linux.conf	2006-10-30 22:24:57.000000000 -0500
 @@ -19,8 +19,8 @@
  QMAKE_LIBS_OPENGL_QT  = -lGL
  QMAKE_LIBS_THREAD     = -lpthread
@@ -20,3 +20,15 @@
  
  QMAKE_AR              = ar cqs
  QMAKE_RANLIB          =
+diff -urNad qt4-x11-4.2.1~/mkspecs/linux-g++/qmake.conf qt4-x11-4.2.1/mkspecs/linux-g++/qmake.conf
+--- qt4-x11-4.2.1~/mkspecs/linux-g++/qmake.conf	2006-10-20 11:35:55.000000000 -0400
++++ qt4-x11-4.2.1/mkspecs/linux-g++/qmake.conf	2006-10-30 22:25:28.000000000 -0500
+@@ -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
+