From 20826a6b110cbe686948d5b14282527be3e79d72 Mon Sep 17 00:00:00 2001 From: Brian Nelson Date: Thu, 7 Jul 2005 08:18:53 +0000 Subject: * removed obsolete 06_disable_rpath patch * libqt4-debug.install: added some designer debug plugins * libqt4-designer.install: explicitly install non-debugging plugins * rules: explicitly specify -debug-and-release configure option --- debian/libqt4-debug.install | 1 + debian/libqt4-designer.install | 3 ++- debian/patches/06_disable_rpath.dpatch | 19 ------------------- debian/rules | 1 + 4 files changed, 4 insertions(+), 20 deletions(-) delete mode 100755 debian/patches/06_disable_rpath.dpatch diff --git a/debian/libqt4-debug.install b/debian/libqt4-debug.install index af7fc9f..5c2ae9b 100644 --- a/debian/libqt4-debug.install +++ b/debian/libqt4-debug.install @@ -1 +1,2 @@ usr/lib/lib*_debug.so.* +usr/lib/qt4/plugins/designer/*_debug.so diff --git a/debian/libqt4-designer.install b/debian/libqt4-designer.install index dd3aef0..116c4ab 100644 --- a/debian/libqt4-designer.install +++ b/debian/libqt4-designer.install @@ -1,3 +1,4 @@ usr/lib/libQtDesigner.so.* usr/lib/libQtDesignerComponents.so.* -usr/lib/qt4/plugins/designer/* +usr/lib/qt4/plugins/designer/*plugin.so +usr/lib/qt4/plugins/designer/libqt3supportwidgets.so diff --git a/debian/patches/06_disable_rpath.dpatch b/debian/patches/06_disable_rpath.dpatch deleted file mode 100755 index ad67d16..0000000 --- a/debian/patches/06_disable_rpath.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_disable_rpath.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt-x11-opensource-4.0.0-b2/mkspecs/linux-g++/qmake.conf /home/nelson/tmp/dpep.Ill3hj/qt-x11-opensource-4.0.0-b2/mkspecs/linux-g++/qmake.conf ---- qt-x11-opensource-4.0.0-b2/mkspecs/linux-g++/qmake.conf 2005-04-06 08:09:50.000000000 -0700 -+++ /home/nelson/tmp/dpep.Ill3hj/qt-x11-opensource-4.0.0-b2/mkspecs/linux-g++/qmake.conf 2005-04-26 20:39:18.000000000 -0700 -@@ -57,7 +57,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 diff --git a/debian/rules b/debian/rules index e88d0c4..b5c7a75 100755 --- a/debian/rules +++ b/debian/rules @@ -27,6 +27,7 @@ common-configure-arch:: -translationdir "/usr/share/qt4/translations" \ -sysconfdir "/etc/qt4" \ -platform linux-g++ \ + -debug-and-release \ -fast \ -no-rpath \ -system-zlib \ -- cgit v1.2.3