| fcd6bc2e | 2014-04-13 21:25:51 | Michele Calgaro |
Fixed tqt3 FTBFS due to updated Postgre SQL library (libpq-dev). This relates to bug 2016. |
||
|
M debian/lenny/dependencies/tqt3/debian/control M debian/lenny/dependencies/tqt3/debian/rules M debian/squeeze/dependencies/tqt3/debian/control M debian/squeeze/dependencies/tqt3/debian/rules M debian/wheezy/dependencies/tqt3/debian/control M debian/wheezy/dependencies/tqt3/debian/rules M ubuntu/maverick/dependencies/tqt3/debian/control M ubuntu/maverick/dependencies/tqt3/debian/rules M ubuntu/precise/dependencies/tqt3/debian/control M ubuntu/precise/dependencies/tqt3/debian/rules M ubuntu/raring/dependencies/tqt3/debian/control M ubuntu/raring/dependencies/tqt3/debian/rules |
||
diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control index d7ff1ee..3eceb9e 100644 --- a/debian/lenny/dependencies/tqt3/debian/control +++ b/debian/lenny/dependencies/tqt3/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, uuid-dev, libglib2.0-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/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules index 4f8f5f7..8dab7d3 100755 --- a/debian/lenny/dependencies/tqt3/debian/rules +++ b/debian/lenny/dependencies/tqt3/debian/rules @@ -99,6 +99,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/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control index 8b5eff5..dbbebbb 100644 --- a/debian/squeeze/dependencies/tqt3/debian/control +++ b/debian/squeeze/dependencies/tqt3/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, uuid-dev, libglib2.0-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/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules index d3ad510..22bedc6 100755 --- a/debian/squeeze/dependencies/tqt3/debian/rules +++ b/debian/squeeze/dependencies/tqt3/debian/rules @@ -99,6 +99,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/wheezy/dependencies/tqt3/debian/control b/debian/wheezy/dependencies/tqt3/debian/control index 8b5eff5..dbbebbb 100644 --- a/debian/wheezy/dependencies/tqt3/debian/control +++ b/debian/wheezy/dependencies/tqt3/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, uuid-dev, libglib2.0-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/wheezy/dependencies/tqt3/debian/rules b/debian/wheezy/dependencies/tqt3/debian/rules index d3ad510..22bedc6 100755 --- a/debian/wheezy/dependencies/tqt3/debian/rules +++ b/debian/wheezy/dependencies/tqt3/debian/rules @@ -99,6 +99,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/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control index 8b5eff5..dbbebbb 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/control +++ b/ubuntu/maverick/dependencies/tqt3/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, uuid-dev, libglib2.0-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/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index d3ad510..22bedc6 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -99,6 +99,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/precise/dependencies/tqt3/debian/control b/ubuntu/precise/dependencies/tqt3/debian/control index 8b5eff5..dbbebbb 100644 --- a/ubuntu/precise/dependencies/tqt3/debian/control +++ b/ubuntu/precise/dependencies/tqt3/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, uuid-dev, libglib2.0-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/precise/dependencies/tqt3/debian/rules b/ubuntu/precise/dependencies/tqt3/debian/rules index d3ad510..22bedc6 100755 --- a/ubuntu/precise/dependencies/tqt3/debian/rules +++ b/ubuntu/precise/dependencies/tqt3/debian/rules @@ -99,6 +99,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/raring/dependencies/tqt3/debian/control b/ubuntu/raring/dependencies/tqt3/debian/control index 8b5eff5..dbbebbb 100644 --- a/ubuntu/raring/dependencies/tqt3/debian/control +++ b/ubuntu/raring/dependencies/tqt3/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, uuid-dev, libglib2.0-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/raring/dependencies/tqt3/debian/rules b/ubuntu/raring/dependencies/tqt3/debian/rules index d3ad510..22bedc6 100755 --- a/ubuntu/raring/dependencies/tqt3/debian/rules +++ b/ubuntu/raring/dependencies/tqt3/debian/rules @@ -99,6 +99,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 \ |
||
| bd47e757 | 2014-04-13 21:31:16 | Michele Calgaro |
Fixed qt3 FTBFS due to updated Postgre SQL library (libpq-dev). This resolves bug 2016. |
||
|
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 debian/wheezy/dependencies/qt3/debian/control M debian/wheezy/dependencies/qt3/debian/rules M ubuntu/maverick/dependencies/qt3/debian/control M ubuntu/maverick/dependencies/qt3/debian/rules M ubuntu/precise/dependencies/qt3/debian/control M ubuntu/precise/dependencies/qt3/debian/rules M ubuntu/raring/dependencies/qt3/debian/control M ubuntu/raring/dependencies/qt3/debian/rules |
||
diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index 2ee1f88..0d369f9 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, uuid-dev, libglib2.0-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 668dfdf..e073f89 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 2ee1f88..0d369f9 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, uuid-dev, libglib2.0-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 20c12d1..7fb60d0 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/debian/wheezy/dependencies/qt3/debian/control b/debian/wheezy/dependencies/qt3/debian/control index 2ee1f88..0d369f9 100644 --- a/debian/wheezy/dependencies/qt3/debian/control +++ b/debian/wheezy/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, uuid-dev, libglib2.0-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/wheezy/dependencies/qt3/debian/rules b/debian/wheezy/dependencies/qt3/debian/rules index 20c12d1..7fb60d0 100755 --- a/debian/wheezy/dependencies/qt3/debian/rules +++ b/debian/wheezy/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 dafffc5..647489d 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, uuid-dev, libglib2.0-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 20c12d1..7fb60d0 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 \ ** Diff limit reached (max: 250 lines) ** |
||
| e43886ab | 2014-04-14 20:54:46 | Michele Calgaro |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging |
||
|
M debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk M debian/lenny/tdebindings/debian/control M debian/squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk M debian/squeeze/tdebindings/debian/control M debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk M debian/wheezy/tdebindings/debian/control M ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk M ubuntu/maverick/tdebindings/debian/control M ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk M ubuntu/precise/tdebindings/debian/control M ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk M ubuntu/raring/tdebindings/debian/control |
||
** Diff limit reached (max: 250 lines) ** |
||