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

[Sune Vuorela]

Author: pusling-guest
Date: 2008-04-15 20:38:41 +0000 (Tue, 15 Apr 2008)
New Revision: 10145

Added:
   trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
fix qmake makefile generation. I wonder if it has any side effects

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-04-15 09:25:09 UTC (rev 10144)
+++ trunk/packages/qt4-x11/debian/changelog	2008-04-15 20:38:41 UTC (rev 10145)
@@ -12,12 +12,14 @@
   * 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.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 12 Apr 2008 18:14:01 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 15 Apr 2008 22:37:01 +0200
 
 qt4-x11 (4.4.0~rc1-3) unstable; urgency=low
 

Added: trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff	2008-04-15 20:38:41 UTC (rev 10145)
@@ -0,0 +1,13 @@
+Index: b/qmake/generators/makefile.cpp
+===================================================================
+--- a/qmake/generators/makefile.cpp
++++ b/qmake/generators/makefile.cpp
+@@ -2334,7 +2334,7 @@
+ 
+         QString mkfile = subtarget->makefile;
+         if(!in_directory.isEmpty())
+-            mkfile.prepend(out_directory);
++            mkfile.prepend(out_directory + Option::dir_sep);
+ 
+         QString in_directory_cdin, in_directory_cdout, out_directory_cdin, out_directory_cdout;
+ #define MAKE_CD_IN_AND_OUT(directory) \

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-04-15 09:25:09 UTC (rev 10144)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-04-15 20:38:41 UTC (rev 10145)
@@ -23,6 +23,7 @@
 11_qdbus_to_dbus_fix.diff
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
+15_fix_qmake_makefile_generation.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff