summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-04-14 11:31:16 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-04-14 11:31:16 +0900
commitbd47e7577f21e5003fee36abb1de2a0feb49edaa (patch)
tree152db91e888713ae1aad22d6287f931517603a5f /ubuntu
parentfcd6bc2e72e3a90de27717dd9fe3e6f3723bdf46 (diff)
downloadtde-packaging-bd47e7577f21e5003fee36abb1de2a0feb49edaa.tar.gz
tde-packaging-bd47e7577f21e5003fee36abb1de2a0feb49edaa.zip
Fixed qt3 FTBFS due to updated Postgre SQL library (libpq-dev).
This resolves bug 2016.
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/dependencies/qt3/debian/control2
-rwxr-xr-xubuntu/maverick/dependencies/qt3/debian/rules1
-rw-r--r--ubuntu/precise/dependencies/qt3/debian/control2
-rwxr-xr-xubuntu/precise/dependencies/qt3/debian/rules1
-rw-r--r--ubuntu/raring/dependencies/qt3/debian/control2
-rwxr-xr-xubuntu/raring/dependencies/qt3/debian/rules1
6 files changed, 6 insertions, 3 deletions
diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control
index dafffc515..647489df9 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/maverick/dependencies/qt3/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/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 20c12d13f..7fb60d085 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/maverick/dependencies/qt3/debian/rules
@@ -95,6 +95,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/qt3/debian/control b/ubuntu/precise/dependencies/qt3/debian/control
index dafffc515..647489df9 100644
--- a/ubuntu/precise/dependencies/qt3/debian/control
+++ b/ubuntu/precise/dependencies/qt3/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/qt3/debian/rules b/ubuntu/precise/dependencies/qt3/debian/rules
index 20c12d13f..7fb60d085 100755
--- a/ubuntu/precise/dependencies/qt3/debian/rules
+++ b/ubuntu/precise/dependencies/qt3/debian/rules
@@ -95,6 +95,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/qt3/debian/control b/ubuntu/raring/dependencies/qt3/debian/control
index dafffc515..647489df9 100644
--- a/ubuntu/raring/dependencies/qt3/debian/control
+++ b/ubuntu/raring/dependencies/qt3/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/qt3/debian/rules b/ubuntu/raring/dependencies/qt3/debian/rules
index 20c12d13f..7fb60d085 100755
--- a/ubuntu/raring/dependencies/qt3/debian/rules
+++ b/ubuntu/raring/dependencies/qt3/debian/rules
@@ -95,6 +95,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 \