| 37929738 | 2015-12-15 12:57:14 | Slávek Banko |
Add variant dependency firebird-dev for qt3/tqt3 on Debian and Ubuntu Refresh qt3/tqt3 patches on Debian and Ubuntu (cherry picked from commit aca32ececd8c1b213f1c07c54543370760f87116) |
||
|
M debian/lenny/dependencies/qt3/debian/control M debian/squeeze/dependencies/qt3/debian/control M ubuntu/maverick/dependencies/qt3/debian/control |
||
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index 72c1df5..121e0a5 100644 --- a/debian/lenny/dependencies/qt3/debian/control +++ b/debian/lenny/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ libfreetype6-dev, libxft-dev, unixodbc-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.7.3 diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control index 72c1df5..121e0a5 100644 --- a/debian/squeeze/dependencies/qt3/debian/control +++ b/debian/squeeze/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ libfreetype6-dev, libxft-dev, unixodbc-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.7.3 diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control index 35831ff..fc4b5b7 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/control +++ b/ubuntu/maverick/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ libfreetype6-dev, libxft-dev, unixodbc-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.7.3 |
||
| 5717b684 | 2015-12-15 12:57:14 | Slávek Banko |
Fix firebird-dev dependency on armel for qt3/tqt3 on Debian and Ubuntu (cherry picked from commit 2dceb5dda0865addbfa7a57058f92bfe78ddedc4) |
||
|
M debian/lenny/dependencies/qt3/debian/control M debian/squeeze/dependencies/qt3/debian/control M ubuntu/maverick/dependencies/qt3/debian/control |
||
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index 121e0a5..aa5acb5 100644 --- a/debian/lenny/dependencies/qt3/debian/control +++ b/debian/lenny/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ libfreetype6-dev, libxft-dev, unixodbc-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird-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 armel] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.7.3 diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control index 121e0a5..aa5acb5 100644 --- a/debian/squeeze/dependencies/qt3/debian/control +++ b/debian/squeeze/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ libfreetype6-dev, libxft-dev, unixodbc-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird-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 armel] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.7.3 diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control index fc4b5b7..f7cd53e 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/control +++ b/ubuntu/maverick/dependencies/qt3/debian/control @@ -11,7 +11,7 @@ libfreetype6-dev, libxft-dev, unixodbc-dev, libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, - firebird-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 armel] | firebird2-dev [i386 amd64] Section: libs Priority: optional Standards-Version: 3.7.3 |
||
| 05017751 | 2015-12-15 12:57:15 | Slávek Banko |
Allow to build TQt3/Qt3 with all libs as a shared on Debian on Ubuntu (cherry picked from commit 4d71fde21440d50d6a4b372921934857fa6da7aa) |
||
|
M debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install M debian/lenny/dependencies/qt3/debian/rules M debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install M debian/squeeze/dependencies/qt3/debian/rules M ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install M ubuntu/maverick/dependencies/qt3/debian/rules |
||
diff --git a/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install b/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install index 6912b64..ad98c31 100644 --- a/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install +++ b/debian/lenny/dependencies/qt3/debian/qt3-apps-dev.install @@ -1,7 +1,4 @@ -usr/lib/libeditor.prl -usr/lib/libeditor.a -usr/lib/libdesignercore.prl -usr/lib/libdesignercore.a -usr/lib/libqassistantclient.prl -usr/lib/libqassistantclient.a +usr/lib/libeditor.* +usr/lib/libdesignercore.* +usr/lib/libqassistantclient.* usr/include/qt3/qassistantclient.h diff --git a/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules index 5b1a547..d8632a7 100755 --- a/debian/lenny/dependencies/qt3/debian/rules +++ b/debian/lenny/dependencies/qt3/debian/rules @@ -142,7 +142,7 @@ $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install # archives get accidentally stripped by make install. Copy over unstripped ones for now. - cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ + -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/qt20fix $(TMP_INSTALL)/usr/bin/ diff --git a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install b/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install index 6912b64..ad98c31 100644 --- a/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install +++ b/debian/squeeze/dependencies/qt3/debian/qt3-apps-dev.install @@ -1,7 +1,4 @@ -usr/lib/libeditor.prl -usr/lib/libeditor.a -usr/lib/libdesignercore.prl -usr/lib/libdesignercore.a -usr/lib/libqassistantclient.prl -usr/lib/libqassistantclient.a +usr/lib/libeditor.* +usr/lib/libdesignercore.* +usr/lib/libqassistantclient.* usr/include/qt3/qassistantclient.h diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules index fe7b55d..08a0a69 100755 --- a/debian/squeeze/dependencies/qt3/debian/rules +++ b/debian/squeeze/dependencies/qt3/debian/rules @@ -142,7 +142,7 @@ $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install # archives get accidentally stripped by make install. Copy over unstripped ones for now. - cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ + -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/qt20fix $(TMP_INSTALL)/usr/bin/ diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install index 6912b64..ad98c31 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install +++ b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install @@ -1,7 +1,4 @@ -usr/lib/libeditor.prl -usr/lib/libeditor.a -usr/lib/libdesignercore.prl -usr/lib/libdesignercore.a -usr/lib/libqassistantclient.prl -usr/lib/libqassistantclient.a +usr/lib/libeditor.* +usr/lib/libdesignercore.* +usr/lib/libqassistantclient.* usr/include/qt3/qassistantclient.h diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index fe7b55d..08a0a69 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -142,7 +142,7 @@ $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install # archives get accidentally stripped by make install. Copy over unstripped ones for now. - cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ + -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/qt20fix $(TMP_INSTALL)/usr/bin/ |
||
| 2ba6e2bc | 2015-12-15 12:57:15 | Michele Calgaro |
Fixed qt3 FTBFS due to updated Postgre SQL library (libpq-dev). This resolves bug 2016. (cherry picked from commit bd47e7577f21e5003fee36abb1de2a0feb49edaa) |
||
|
M debian/lenny/dependencies/qt3/debian/control M debian/lenny/dependencies/qt3/debian/rules M debian/squeeze/dependencies/qt3/debian/control M debian/squeeze/dependencies/qt3/debian/rules M ubuntu/maverick/dependencies/qt3/debian/control M ubuntu/maverick/dependencies/qt3/debian/rules |
||
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index aa5acb5..587cb4b 100644 --- a/debian/lenny/dependencies/qt3/debian/control +++ b/debian/lenny/dependencies/qt3/debian/control @@ -9,7 +9,7 @@ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, unixodbc-dev, - libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, + libmysqlclient-dev, flex, libpq-dev, libpq-dev (<= 9.3.3-1) | postgresql-server-dev-all, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel] | firebird2-dev [i386 amd64] Section: libs diff --git a/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules index d8632a7..e3e7549 100755 --- a/debian/lenny/dependencies/qt3/debian/rules +++ b/debian/lenny/dependencies/qt3/debian/rules @@ -95,6 +95,7 @@ -I/usr/include/mysql \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ + -I`pg_config --includedir-server` \ -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \ diff --git a/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control index aa5acb5..587cb4b 100644 --- a/debian/squeeze/dependencies/qt3/debian/control +++ b/debian/squeeze/dependencies/qt3/debian/control @@ -9,7 +9,7 @@ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, unixodbc-dev, - libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, + libmysqlclient-dev, flex, libpq-dev, libpq-dev (<= 9.3.3-1) | postgresql-server-dev-all, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel] | firebird2-dev [i386 amd64] Section: libs diff --git a/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules index 08a0a69..09124ab 100755 --- a/debian/squeeze/dependencies/qt3/debian/rules +++ b/debian/squeeze/dependencies/qt3/debian/rules @@ -95,6 +95,7 @@ -I/usr/include/mysql \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ + -I`pg_config --includedir-server` \ -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \ diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control index f7cd53e..e83133b 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/control +++ b/ubuntu/maverick/dependencies/qt3/debian/control @@ -9,7 +9,7 @@ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, unixodbc-dev, - libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev, + libmysqlclient-dev, flex, libpq-dev, libpq-dev (<= 9.3.3-1) | postgresql-server-dev-all, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel] | firebird2-dev [i386 amd64] Section: libs diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index 08a0a69..09124ab 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -95,6 +95,7 @@ -I/usr/include/mysql \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ + -I`pg_config --includedir-server` \ -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \ |
||
| d5ba1d3f | 2015-12-15 12:57:16 | Slávek Banko |
Fix PostgreSQL dependency in tqt3/qt3 on Debian and Ubuntu (cherry picked from commit d3df6df7970f8589106a3658a7bd04050ba8e79f) |
||
|
M debian/lenny/dependencies/qt3/debian/control M debian/squeeze/dependencies/qt3/debian/control M ubuntu/maverick/dependencies/qt3/debian/control |
||
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index 587cb4b..e642c81 100644 --- a/debian/lenny/dependencies/qt3/debian/control +++ b/debian/lenny/dependencies/qt3/debian/control @@ -9,7 +9,7 @@ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, unixodbc-dev, - libmysqlclient-dev, flex, libpq-dev, libpq-dev (<= 9.3.3-1) | postgresql-server-dev-all, libaudio-dev, libcups2-dev, + libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel] | firebird2-dev [i386 amd64] Section: libs ** Diff limit reached (max: 250 lines) ** |
||