summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-04-15 10:54:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-04-15 10:54:46 +0900
commite43886ab00b67710c21bb9c4e9b6a46fa9cb19e8 (patch)
tree9770bc5f7891be0f8821056175d363c8603fd8e5 /ubuntu/precise
parentbd47e7577f21e5003fee36abb1de2a0feb49edaa (diff)
parent5f79afd8eb4b60b7234f70c558612665e13e4e9d (diff)
downloadtde-packaging-e43886ab00b67710c21bb9c4e9b6a46fa9cb19e8.tar.gz
tde-packaging-e43886ab00b67710c21bb9c4e9b6a46fa9cb19e8.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/tdebindings/debian/cdbs/debian-qt-kde.mk2
-rw-r--r--ubuntu/precise/tdebindings/debian/control10
2 files changed, 6 insertions, 6 deletions
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~)