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

[Brian Nelson]

Author: pyro
Date: 2006-06-21 17:20:08 +0000 (Wed, 21 Jun 2006)
New Revision: 4007

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/18_disable_opengl_visibility.dpatch
Log:
  * debian/patches/18_disable_opengl_visibility.dpatch: regenerated so
    that it applies correctly for me

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-06-21 16:55:29 UTC (rev 4006)
+++ trunk/packages/qt4-x11/debian/changelog	2006-06-21 17:20:08 UTC (rev 4007)
@@ -3,8 +3,11 @@
   * debian/patches/19_s390_atomic: patch from Bastian Blank to fix
     including of s390 specific atomic header. (Closes: #370241)
 
- -- Brian Nelson <pyro at debian.org>  Wed, 21 Jun 2006 09:54:33 -0700
+  * debian/patches/18_disable_opengl_visibility.dpatch: regenerated so
+    that it applies correctly for me
 
+ -- Brian Nelson <pyro at debian.org>  Wed, 21 Jun 2006 10:19:54 -0700
+
 qt4-x11 (4.1.3-2) unstable; urgency=high
 
   * patches/18_disable_opengl_visibility: disable -fvisibility-inlines-hidden

Modified: trunk/packages/qt4-x11/debian/patches/18_disable_opengl_visibility.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/18_disable_opengl_visibility.dpatch	2006-06-21 16:55:29 UTC (rev 4006)
+++ trunk/packages/qt4-x11/debian/patches/18_disable_opengl_visibility.dpatch	2006-06-21 17:20:08 UTC (rev 4007)
@@ -4,8 +4,9 @@
 ## DP: temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
 
 @DPATCH@
---- src/opengl/opengl.pro.orig
-+++ src/opengl/opengl.pro
+diff -urNad qt4-x11-4.1.3~/src/opengl/opengl.pro qt4-x11-4.1.3/src/opengl/opengl.pro
+--- qt4-x11-4.1.3~/src/opengl/opengl.pro	2006-05-14 03:46:44.000000000 -0700
++++ qt4-x11-4.1.3/src/opengl/opengl.pro	2006-06-21 10:17:37.000000000 -0700
 @@ -5,6 +5,7 @@
  win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
  solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2