From fcd6bc2e72e3a90de27717dd9fe3e6f3723bdf46 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 14 Apr 2014 11:25:51 +0900 Subject: [PATCH] Fixed tqt3 FTBFS due to updated Postgre SQL library (libpq-dev). This relates to bug 2016. --- debian/lenny/dependencies/tqt3/debian/control | 2 +- debian/lenny/dependencies/tqt3/debian/rules | 1 + debian/squeeze/dependencies/tqt3/debian/control | 2 +- debian/squeeze/dependencies/tqt3/debian/rules | 1 + debian/wheezy/dependencies/tqt3/debian/control | 2 +- debian/wheezy/dependencies/tqt3/debian/rules | 1 + ubuntu/maverick/dependencies/tqt3/debian/control | 2 +- ubuntu/maverick/dependencies/tqt3/debian/rules | 1 + ubuntu/precise/dependencies/tqt3/debian/control | 2 +- ubuntu/precise/dependencies/tqt3/debian/rules | 1 + ubuntu/raring/dependencies/tqt3/debian/control | 2 +- ubuntu/raring/dependencies/tqt3/debian/rules | 1 + 12 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control index d7ff1eef8..3eceb9e39 100644 --- a/debian/lenny/dependencies/tqt3/debian/control +++ b/debian/lenny/dependencies/tqt3/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d 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 4f8f5f70c..8dab7d359 100755 --- a/debian/lenny/dependencies/tqt3/debian/rules +++ b/debian/lenny/dependencies/tqt3/debian/rules @@ -99,6 +99,7 @@ CONFIGURE_OPTS = \ -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 8b5eff521..dbbebbbb8 100644 --- a/debian/squeeze/dependencies/tqt3/debian/control +++ b/debian/squeeze/dependencies/tqt3/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d 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 d3ad5100f..22bedc69d 100755 --- a/debian/squeeze/dependencies/tqt3/debian/rules +++ b/debian/squeeze/dependencies/tqt3/debian/rules @@ -99,6 +99,7 @@ CONFIGURE_OPTS = \ -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 8b5eff521..dbbebbbb8 100644 --- a/debian/wheezy/dependencies/tqt3/debian/control +++ b/debian/wheezy/dependencies/tqt3/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d 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 d3ad5100f..22bedc69d 100755 --- a/debian/wheezy/dependencies/tqt3/debian/rules +++ b/debian/wheezy/dependencies/tqt3/debian/rules @@ -99,6 +99,7 @@ CONFIGURE_OPTS = \ -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 8b5eff521..dbbebbbb8 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/control +++ b/ubuntu/maverick/dependencies/tqt3/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d 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 d3ad5100f..22bedc69d 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -99,6 +99,7 @@ CONFIGURE_OPTS = \ -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 8b5eff521..dbbebbbb8 100644 --- a/ubuntu/precise/dependencies/tqt3/debian/control +++ b/ubuntu/precise/dependencies/tqt3/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d 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 d3ad5100f..22bedc69d 100755 --- a/ubuntu/precise/dependencies/tqt3/debian/rules +++ b/ubuntu/precise/dependencies/tqt3/debian/rules @@ -99,6 +99,7 @@ CONFIGURE_OPTS = \ -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 8b5eff521..dbbebbbb8 100644 --- a/ubuntu/raring/dependencies/tqt3/debian/control +++ b/ubuntu/raring/dependencies/tqt3/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.d 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 d3ad5100f..22bedc69d 100755 --- a/ubuntu/raring/dependencies/tqt3/debian/rules +++ b/ubuntu/raring/dependencies/tqt3/debian/rules @@ -99,6 +99,7 @@ CONFIGURE_OPTS = \ -I/usr/include/mysql \ -I/usr/include/freetype2 \ -I`pg_config --includedir` \ + -I`pg_config --includedir-server` \ -L/usr/lib/$(DEB_HOST_MULTIARCH)\ \ -lfontconfig \