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

[Adeodato Simó]

Author: adeodato
Date: 2005-09-04 23:59:49 +0000 (Sun, 04 Sep 2005)
New Revision: 1682

Modified:
   trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch
   trunk/packages/qt-x11-free/debian/rules
Log:
Forgot to merge this.


Modified: trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch	2005-09-04 23:42:39 UTC (rev 1681)
+++ trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.dpatch	2005-09-04 23:59:49 UTC (rev 1682)
@@ -34,3 +34,14 @@
  
  QMAKE_LIBS		=
  QMAKE_LIBS_DYNLOAD	= -ldl
+--- qt.orig/mkspecs/linux-g++-64/qmake.conf
++++ qt.patched/mkspecs/linux-g++-64/qmake.conf
+@@ -56,7 +56,7 @@
+ QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	=
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH		=
+ 
+ QMAKE_LIBS		=
+ QMAKE_LIBS_DYNLOAD	= -ldl

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-09-04 23:42:39 UTC (rev 1681)
+++ trunk/packages/qt-x11-free/debian/rules	2005-09-04 23:59:49 UTC (rev 1682)
@@ -234,7 +234,10 @@
 	# install the overrides files
 	for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done
 	for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo	"$$a" | sed 's/debian\/overrides\///g'`; done
-	
+
+	chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/aix-g++-64/qplatformdefs.h
+	chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/macx-pbuilder/Info.plist.app
+
 binary-indep: build install
 
 	# Build architecture-independent files here.