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

[Brian Nelson]

Author: pyro
Date: 2005-08-30 23:52:52 +0000 (Tue, 30 Aug 2005)
New Revision: 1617

Added:
   trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/10_qmake_use_qt4_tools.dpatch: new patch that modifies
    qmake.conf so that qmake generates Makefiles that use the -qt4 tools.
    This way, it can cope with systems that have alternatives set to use
    the -qt3 versions.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-08-30 17:42:23 UTC (rev 1616)
+++ trunk/packages/qt4-x11/debian/changelog	2005-08-30 23:52:52 UTC (rev 1617)
@@ -1,3 +1,12 @@
+qt4-x11 (4.0.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/10_qmake_use_qt4_tools.dpatch: new patch that modifies
+    qmake.conf so that qmake generates Makefiles that use the -qt4 tools.
+    This way, it can cope with systems that have alternatives set to use
+    the -qt3 versions.
+
+ -- Brian Nelson <pyro at debian.org>  Tue, 30 Aug 2005 15:22:22 -0700
+
 qt4-x11 (4.0.1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2005-08-30 17:42:23 UTC (rev 1616)
+++ trunk/packages/qt4-x11/debian/patches/00list	2005-08-30 23:52:52 UTC (rev 1617)
@@ -0,0 +1 @@
+10_qmake_use_qt4_tools

Added: trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch	2005-08-30 17:42:23 UTC (rev 1616)
+++ trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch	2005-08-30 23:52:52 UTC (rev 1617)
@@ -0,0 +1,21 @@
+#! /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.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./mkspecs/linux-g++/qmake.conf /home/nelson/tmp/dpep-work.OgCbL2/qt4-x11-4.0.1/mkspecs/linux-g++/qmake.conf
+--- ./mkspecs/linux-g++/qmake.conf	2005-08-16 01:41:05.000000000 -0700
++++ /home/nelson/tmp/dpep-work.OgCbL2/qt4-x11-4.0.1/mkspecs/linux-g++/qmake.conf	2005-08-30 15:17:58.000000000 -0700
+@@ -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		=


Property changes on: trunk/packages/qt4-x11/debian/patches/10_qmake_use_qt4_tools.dpatch
___________________________________________________________________
Name: svn:executable
   + *