[Pkg-kde-commits] rev 1275 - in trunk/packages/qt-x11-free/debian: . patches
Adeodato Simó
adeodato@costa.debian.org
Tue, 12 Jul 2005 20:38:36 +0000
Author: adeodato
Date: 2005-07-12 20:38:35 +0000 (Tue, 12 Jul 2005)
New Revision: 1275
Added:
trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/patches/00list
Log:
Included from Christopher's changes:
* Don't use lib64 on amd64. (Closes: #311562)
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2005-07-12 20:29:37 UTC (rev 1274)
+++ trunk/packages/qt-x11-free/debian/changelog 2005-07-12 20:38:35 UTC (rev 1275)
@@ -20,6 +20,8 @@
* Fix qt3-designer's appearance in the KDE menu. (Closes: #290402)
+ * Don't use lib64 on amd64. (Closes: #311562)
+
* Don't duplicate the information in the qvfb manpage. (Closes: #282217)
* Add linguist manpage. Thanks to Jeremy Laine. (Closes: #268882)
Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list 2005-07-12 20:29:37 UTC (rev 1274)
+++ trunk/packages/qt-x11-free/debian/patches/00list 2005-07-12 20:38:35 UTC (rev 1275)
@@ -3,6 +3,7 @@
04_qsql_odbc
05_qvfb_cpp
06_disable_rpath
+09_amd64_lib64
14_fix_kmenu
15_unify_declarations_glibc
16_fix_opengl_check
Added: trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.dpatch 2005-07-12 20:29:37 UTC (rev 1274)
+++ trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.dpatch 2005-07-12 20:38:35 UTC (rev 1275)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- qt.orig/mkspecs/linux-g++-64/qmake.conf
++++ qt.patched/mkspecs/linux-g++-64/qmake.conf
+@@ -41,11 +41,11 @@
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+ QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
++QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+ QMAKE_INCDIR_QT = $(QTDIR)/include
+ QMAKE_LIBDIR_QT = $(QTDIR)/lib
+ QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
++QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+
+ QMAKE_LINK = g++
+ QMAKE_LINK_SHLIB = g++
Property changes on: trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
___________________________________________________________________
Name: svn:executable
+ *