diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-10 16:43:41 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-10 16:45:47 +0200 |
| commit | aca32ececd8c1b213f1c07c54543370760f87116 (patch) | |
| tree | bf9a6619a2c26fcc9e93cecabafa77b622e8a69f /ubuntu/maverick | |
| parent | 0cfa01db4de5bfcf6e8c05937ca8774594bf1af3 (diff) | |
| download | tde-packaging-aca32ececd8c1b213f1c07c54543370760f87116.tar.gz tde-packaging-aca32ececd8c1b213f1c07c54543370760f87116.zip | |
Add variant dependency firebird-dev for qt3/tqt3 on Debian and Ubuntu
Refresh qt3/tqt3 patches on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick')
4 files changed, 18 insertions, 10 deletions
diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control index 4be146e7d..7641cffbf 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/control +++ b/ubuntu/maverick/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] + firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff index 27fc1426c..a3d74ffce 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff +++ b/ubuntu/maverick/dependencies/qt3/debian/patches/06_disable_rpath.diff @@ -2,25 +2,29 @@ author: Martin Loschwitz <madkiss@madkiss.org> Disables the rpath settings in qmake.conf +Index: b/mkspecs/linux-g++/qmake.conf +=================================================================== --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf -@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared +@@ -55,7 +55,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 = -luuid QMAKE_LIBS_DYNLOAD = -ldl +Index: b/mkspecs/linux-g++-64/qmake.conf +=================================================================== --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf -@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared +@@ -58,7 +58,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 = -luuid QMAKE_LIBS_DYNLOAD = -ldl diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control index b45983f80..1655a1357 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/control +++ b/ubuntu/maverick/dependencies/tqt3/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1- libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] + firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff index 27fc1426c..a3d74ffce 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff +++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff @@ -2,25 +2,29 @@ author: Martin Loschwitz <madkiss@madkiss.org> Disables the rpath settings in qmake.conf +Index: b/mkspecs/linux-g++/qmake.conf +=================================================================== --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf -@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared +@@ -55,7 +55,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 = -luuid QMAKE_LIBS_DYNLOAD = -ldl +Index: b/mkspecs/linux-g++-64/qmake.conf +=================================================================== --- a/mkspecs/linux-g++-64/qmake.conf +++ b/mkspecs/linux-g++-64/qmake.conf -@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared +@@ -58,7 +58,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 = -luuid QMAKE_LIBS_DYNLOAD = -ldl |