[Pkg-kde-commits] rev 1431 - in trunk/packages/qt-x11-free/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-08-11 16:57:02 +0000 (Thu, 11 Aug 2005)
New Revision: 1431

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
Log:
Patch original, not symlink, in 15_unify_declarations_glibc.dpatch.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-08-11 16:35:53 UTC (rev 1430)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-08-11 16:57:02 UTC (rev 1431)
@@ -2,8 +2,9 @@
 
   +++ Changes by Adeodato Simó:
 
-  * [08_arm_gcc4.dpatch] Patch the original file, not the symlink, since patch
-    makes a copy. D'oh.
+  * Fix new arm FTBFS: in 08_arm_gcc4.dpatch, patch the original file, not the
+    symlink, since patch makes a copy. Fix 15_unify_declarations_glibc.dpatch
+    too.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2005 18:29:30 +0200
 

Modified: trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-08-11 16:35:53 UTC (rev 1430)
+++ trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-08-11 16:57:02 UTC (rev 1431)
@@ -70,9 +70,9 @@
  #elif defined(__DGUX__)
  #  define Q_OS_DGUX
  #elif defined(__QNXNTO__)
-diff -ur qt-x11-free-3.2.3.old/include/qglobal.h qt-x11-free-3.2.3/include/qglobal.h
---- qt-x11-free-3.2.3.old/include/qglobal.h	2003-11-10 11:21:38.000000000 +0100
-+++ qt-x11-free-3.2.3/include/qglobal.h	2004-08-05 00:40:23.000000000 +0200
+diff -ur qt-x11-free-3.2.3.old/src/tools/qglobal.h qt-x11-free-3.2.3/src/tools/qglobal.h
+--- qt-x11-free-3.2.3.old/src/tools/qglobal.h	2003-11-10 11:21:38.000000000 +0100
++++ qt-x11-free-3.2.3/src/tools/qglobal.h	2004-08-05 00:40:23.000000000 +0200
 @@ -112,7 +112,7 @@
  #  define Q_OS_ULTRIX
  #elif defined(sinix)