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

6 files changed, 18 insertions, 18 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~)