Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 10 insertions, 8 deletions

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/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/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~)