From fcd6bc2e72e3a90de27717dd9fe3e6f3723bdf46 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 14 Apr 2014 11:25:51 +0900
Subject: [PATCH 1/3] 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			\

From bd47e7577f21e5003fee36abb1de2a0feb49edaa Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 14 Apr 2014 11:31:16 +0900
Subject: [PATCH 2/3] Fixed qt3 FTBFS due to updated Postgre SQL library
 (libpq-dev). This resolves bug 2016.

---
 debian/lenny/dependencies/qt3/debian/control    | 2 +-
 debian/lenny/dependencies/qt3/debian/rules      | 1 +
 debian/squeeze/dependencies/qt3/debian/control  | 2 +-
 debian/squeeze/dependencies/qt3/debian/rules    | 1 +
 debian/wheezy/dependencies/qt3/debian/control   | 2 +-
 debian/wheezy/dependencies/qt3/debian/rules     | 1 +
 ubuntu/maverick/dependencies/qt3/debian/control | 2 +-
 ubuntu/maverick/dependencies/qt3/debian/rules   | 1 +
 ubuntu/precise/dependencies/qt3/debian/control  | 2 +-
 ubuntu/precise/dependencies/qt3/debian/rules    | 1 +
 ubuntu/raring/dependencies/qt3/debian/control   | 2 +-
 ubuntu/raring/dependencies/qt3/debian/rules     | 1 +
 12 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control
index 2ee1f8830..0d369f97a 100644
--- a/debian/lenny/dependencies/qt3/debian/control
+++ b/debian/lenny/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/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules
index 668dfdfd5..e073f8910 100755
--- a/debian/lenny/dependencies/qt3/debian/rules
+++ b/debian/lenny/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/debian/squeeze/dependencies/qt3/debian/control b/debian/squeeze/dependencies/qt3/debian/control
index 2ee1f8830..0d369f97a 100644
--- a/debian/squeeze/dependencies/qt3/debian/control
+++ b/debian/squeeze/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/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules
index 20c12d13f..7fb60d085 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/debian/squeeze/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/debian/wheezy/dependencies/qt3/debian/control b/debian/wheezy/dependencies/qt3/debian/control
index 2ee1f8830..0d369f97a 100644
--- a/debian/wheezy/dependencies/qt3/debian/control
+++ b/debian/wheezy/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/debian/wheezy/dependencies/qt3/debian/rules b/debian/wheezy/dependencies/qt3/debian/rules
index 20c12d13f..7fb60d085 100755
--- a/debian/wheezy/dependencies/qt3/debian/rules
+++ b/debian/wheezy/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/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			\

From 5f79afd8eb4b60b7234f70c558612665e13e4e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 15 Apr 2014 00:25:11 +0200
Subject: [PATCH 3/3] Enable java in tdebindings for other architectures on
 Debian and Ubuntu

---
 debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk  |  2 +-
 debian/lenny/tdebindings/debian/control                | 10 +++++-----
 .../squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk   |  2 +-
 debian/squeeze/tdebindings/debian/control              | 10 +++++-----
 debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk |  2 +-
 debian/wheezy/tdebindings/debian/control               | 10 +++++-----
 .../maverick/tdebindings/debian/cdbs/debian-qt-kde.mk  |  2 +-
 ubuntu/maverick/tdebindings/debian/control             | 10 +++++-----
 .../precise/tdebindings/debian/cdbs/debian-qt-kde.mk   |  2 +-
 ubuntu/precise/tdebindings/debian/control              | 10 +++++-----
 ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk |  2 +-
 ubuntu/raring/tdebindings/debian/control               | 10 +++++-----
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk
index 1e862f623..ec780b73a 100644
--- a/debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -16,7 +16,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/lenny/tdebindings/debian/control b/debian/lenny/tdebindings/debian/control
index 78bf5b062..50e66082e 100644
--- a/debian/lenny/tdebindings/debian/control
+++ b/debian/lenny/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
- gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
+ gettext, default-jdk [amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
@@ -38,7 +38,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -52,7 +52,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -83,7 +83,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-trinity (<< 4:14.0.0~)
@@ -112,7 +112,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-trinity (<< 4:14.0.0~)
diff --git a/debian/squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk
index 1e862f623..ec780b73a 100644
--- a/debian/squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -16,7 +16,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/tdebindings/debian/control b/debian/squeeze/tdebindings/debian/control
index 78bf5b062..50e66082e 100644
--- a/debian/squeeze/tdebindings/debian/control
+++ b/debian/squeeze/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
- gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
+ gettext, default-jdk [amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
@@ -38,7 +38,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -52,7 +52,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -83,7 +83,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-trinity (<< 4:14.0.0~)
@@ -112,7 +112,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-trinity (<< 4:14.0.0~)
diff --git a/debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk
index 1e862f623..ec780b73a 100644
--- a/debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -16,7 +16,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/wheezy/tdebindings/debian/control b/debian/wheezy/tdebindings/debian/control
index 78bf5b062..50e66082e 100644
--- a/debian/wheezy/tdebindings/debian/control
+++ b/debian/wheezy/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
- gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
+ gettext, default-jdk [amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
@@ -38,7 +38,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -52,7 +52,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -83,7 +83,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-trinity (<< 4:14.0.0~)
@@ -112,7 +112,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-trinity (<< 4:14.0.0~)
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
index 1e862f623..ec780b73a 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -16,7 +16,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index 9660f943a..0a425318d 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
- gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
+ gettext, default-jdk [amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
@@ -38,7 +38,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -52,7 +52,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -83,7 +83,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
@@ -112,7 +112,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
diff --git a/ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk
index 1e862f623..ec780b73a 100644
--- a/ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -16,7 +16,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/ubuntu/precise/tdebindings/debian/control b/ubuntu/precise/tdebindings/debian/control
index 9660f943a..0a425318d 100644
--- a/ubuntu/precise/tdebindings/debian/control
+++ b/ubuntu/precise/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
- gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
+ gettext, default-jdk [amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
@@ -38,7 +38,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -52,7 +52,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -83,7 +83,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
@@ -112,7 +112,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
diff --git a/ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk
index 1e862f623..ec780b73a 100644
--- a/ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdebindings/debian/cdbs/debian-qt-kde.mk
@@ -16,7 +16,7 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/ubuntu/raring/tdebindings/debian/control b/ubuntu/raring/tdebindings/debian/control
index 9660f943a..0a425318d 100644
--- a/ubuntu/raring/tdebindings/debian/control
+++ b/ubuntu/raring/tdebindings/debian/control
@@ -1,7 +1,7 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
  python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
- gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
+ gettext, default-jdk [amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc],
  tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
  automake, autoconf, libtool, libltdl-dev
@@ -38,7 +38,7 @@ Description: DCOP bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
 Breaks: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~)
@@ -52,7 +52,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libdcop3-java-trinity-dev
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libdevel
 Replaces: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
 Breaks: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~)
@@ -83,7 +83,7 @@ Description: Java bindings for Qt [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libqt3-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
 Breaks: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~)
@@ -112,7 +112,7 @@ Description: tdelibs bindings for Java [Trinity]
  This package is part of the official TDE bindings module.
 
 Package: libtrinity-jni-trinity
-Architecture: amd64 i386 ia64 powerpc s390 sparc
+Architecture: amd64 i386 armel armhf mips mipsel ia64 powerpc s390 sparc
 Section: libs
 Replaces: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)
 Breaks: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~)