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

[Adeodato Simó]

Author: adeodato
Date: 2005-08-11 16:35:53 +0000 (Thu, 11 Aug 2005)
New Revision: 1430

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch
Log:
08_arm_gcc4.dpatch: Patch the original file, not the symlink, since
patch makes a copy. D'oh.



Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-08-11 14:41:24 UTC (rev 1429)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-08-11 16:35:53 UTC (rev 1430)
@@ -1,3 +1,12 @@
+qt-x11-free (3:3.3.4-7) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * [08_arm_gcc4.dpatch] Patch the original file, not the symlink, since patch
+    makes a copy. D'oh.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2005 18:29:30 +0200
+
 qt-x11-free (3:3.3.4-6) unstable; urgency=low
 
   * The "If debussy had been up..." release.

Modified: trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch	2005-08-11 14:41:24 UTC (rev 1429)
+++ trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch	2005-08-11 16:35:53 UTC (rev 1430)
@@ -19,8 +19,8 @@
 exit 0
 
 @DPATCH@
---- qt/include/qglobal.h
-+++ qt/include/qglobal.h
+--- qt/src/tools/qglobal.h
++++ qt/src/tools/qglobal.h
 @@ -300,7 +300,7 @@
     supposedly know what you are doing.) */
  #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
@@ -30,8 +30,8 @@
  #      define Q_NO_PACKED_REFERENCE
  #    endif
  #  endif
---- qt/include/qstring.h
-+++ qt/include/qstring.h
+--- qt/src/tools/qstring.h
++++ qt/src/tools/qstring.h
 @@ -194,7 +194,7 @@
      char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
      ushort unicode() const { return ucs; }