DEB: Require intltool as build-deps always, regardless of gettext version.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago · fa655b956c
parent e6245ec7f3
commit fa655b956c
71 changed files with 71 additions and 71 deletions
--- a/debian/_base/applications/abakus/debian/control
+++ b/debian/_base/applications/abakus/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 9~), quilt, cdbs (>= 0.4.0), cmake, intltool | gettext (>= 0.19~), imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 9~), quilt, cdbs (>= 0.4.0), cmake, intltool, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4

 Package: abakus-trinity
--- a/debian/_base/applications/dolphin/debian/control
+++ b/debian/_base/applications/dolphin/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4

 Package: dolphin-trinity
--- a/debian/_base/applications/filelight/debian/control
+++ b/debian/_base/applications/filelight/debian/control
@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, xutils, chrpath, quilt (>= 0.40), libltdl-dev
+Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool, tdelibs14-trinity-dev, xutils, chrpath, quilt (>= 0.40), libltdl-dev
 Homepage: http://www.methylblue.com/filelight/

 Package: filelight-trinity
--- a/debian/_base/applications/katapult/debian/control
+++ b/debian/_base/applications/katapult/debian/control
@ -2,7 +2,7 @@ Source: katapult-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libxi-dev, sharutils
+Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libxi-dev, sharutils
 Standards-Version: 3.8.4

 Package: katapult-trinity
--- a/debian/_base/applications/kbarcode/debian/control
+++ b/debian/_base/applications/kbarcode/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kbarcode-trinity
--- a/debian/_base/applications/kbibtex/debian/control
+++ b/debian/_base/applications/kbibtex/debian/control
@ -2,7 +2,7 @@ Source: kbibtex-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
 Standards-Version: 3.9.0
 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git
--- a/debian/_base/applications/kbiff/debian/control
+++ b/debian/_base/applications/kbiff/debian/control
@ -2,7 +2,7 @@ Source: kbiff-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev (>= 4:3.4.2)
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev (>= 4:3.4.2)
 Standards-Version: 3.9.1

 Package: kbiff-trinity
--- a/debian/_base/applications/kbookreader/debian/control
+++ b/debian/_base/applications/kbookreader/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/

--- a/debian/_base/applications/kcmautostart/debian/control
+++ b/debian/_base/applications/kcmautostart/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kcontrol-autostart-trinity
--- a/debian/_base/applications/kcpuload/debian/control
+++ b/debian/_base/applications/kcpuload/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kcpuload-trinity
--- a/debian/_base/applications/kdirstat/debian/control
+++ b/debian/_base/applications/kdirstat/debian/control
@ -2,7 +2,7 @@ Source: kdirstat-trinity
 Section: misc
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kdirstat.sourceforge.net/

--- a/debian/_base/applications/kiosktool/debian/control
+++ b/debian/_base/applications/kiosktool/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kiosktool-trinity
--- a/debian/_base/applications/kkbswitch/debian/control
+++ b/debian/_base/applications/kkbswitch/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
 Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libxkbfile-dev
+Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool, tdelibs14-trinity-dev, libxkbfile-dev
 Standards-Version: 3.7.3
 Homepage: http://kkbswitch.sourceforge.net/

--- a/debian/_base/applications/knetload/debian/control
+++ b/debian/_base/applications/knetload/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev
 Standards-Version: 3.8.4

 Package: knetload-trinity
--- a/debian/_base/applications/knetstats/debian/control
+++ b/debian/_base/applications/knetstats/debian/control
@ -2,7 +2,7 @@ Source: knetstats-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knetstats.sourceforge.net/

--- a/debian/_base/applications/knights/debian/control
+++ b/debian/_base/applications/knights/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/

--- a/debian/_base/applications/knmap/debian/control
+++ b/debian/_base/applications/knmap/debian/control
@ -2,7 +2,7 @@ Source: knmap-trinity
 Section: tde
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.2

 Package: knmap-trinity
--- a/debian/_base/applications/knowit/debian/control
+++ b/debian/_base/applications/knowit/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knowit.sourceforge.net/

--- a/debian/_base/applications/knutclient/debian/control
+++ b/debian/_base/applications/knutclient/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool, tdelibs14-trinity-dev
 Homepage: http://www.knut.noveradsl.cz/knutclient/

 Package: knutclient-trinity
--- a/debian/_base/applications/kpicosim/debian/control
+++ b/debian/_base/applications/kpicosim/debian/control
@ -2,7 +2,7 @@ Source: kpicosim-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kpicosim-trinity
--- a/debian/_base/applications/krename/debian/control
+++ b/debian/_base/applications/krename/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Richard A. Johnson <nixternal@ubuntu.com> 
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
 Standards-Version: 3.8.4

 Package: krename-trinity
--- a/debian/_base/applications/ksensors/debian/control
+++ b/debian/_base/applications/ksensors/debian/control
@ -2,7 +2,7 @@ Source: ksensors-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3

--- a/debian/_base/applications/kshutdown/debian/control
+++ b/debian/_base/applications/kshutdown/debian/control
@ -2,7 +2,7 @@ Source: kshutdown-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.1

 Package: kshutdown-trinity
--- a/debian/_base/applications/ksplash-engine-moodin/debian/control
+++ b/debian/_base/applications/ksplash-engine-moodin/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdebase-trinity-dev, ksplash-trinity
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdebase-trinity-dev, ksplash-trinity
 Standards-Version: 3.8.4

 Package: ksplash-engine-moodin-trinity
--- a/debian/_base/applications/kvkbd/debian/control
+++ b/debian/_base/applications/kvkbd/debian/control
@ -2,7 +2,7 @@ Source: kvkbd-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), libxtst-dev, tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, libxtst-dev, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://pan4os.info/main/index.php

--- a/debian/_base/applications/kvpnc/debian/control
+++ b/debian/_base/applications/kvpnc/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
 Standards-Version: 3.8.4

 Package: kvpnc-trinity
--- a/debian/_base/applications/mplayerthumbs/debian/control
+++ b/debian/_base/applications/mplayerthumbs/debian/control
@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.2

 Package: mplayerthumbs-trinity
--- a/debian/_base/applications/potracegui/debian/control
+++ b/debian/_base/applications/potracegui/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net>
 Uploaders: Bartosz Fenski <fenio@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: potracegui-trinity
--- a/debian/_base/applications/tdedocker/debian/control
+++ b/debian/_base/applications/tdedocker/debian/control
@ -2,7 +2,7 @@ Source: tdedocker-trinity
 Section: x11
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs-trinity-dev, libxpm-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs-trinity-dev, libxpm-dev
 Standards-Version: 3.7.2

 Package: tdedocker-trinity
--- a/debian/_base/applications/tdeio-apt/debian/control
+++ b/debian/_base/applications/tdeio-apt/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: tdeio-apt-trinity
--- a/debian/_base/applications/tdeio-sword/debian/control
+++ b/debian/_base/applications/tdeio-sword/debian/control
@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
 Section: tde
 Priority: extra
 Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
 Standards-Version: 3.7.2

 Package: tdeio-sword-trinity
--- a/debian/_base/applications/tdmtheme/debian/control
+++ b/debian/_base/applications/tdmtheme/debian/control
@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>,
 Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://beta.smileaf.org/projects

--- a/debian/_base/applications/wlassistant/debian/control
+++ b/debian/_base/applications/wlassistant/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4

 Package: wlassistant-trinity
--- a/debian/_base/applications/yakuake/debian/control
+++ b/debian/_base/applications/yakuake/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://extragear.kde.org/apps/yakuake/

--- a/debian/_base/tdetoys/debian/control
+++ b/debian/_base/tdetoys/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: tdetoys-trinity
--- a/dilos/tdetoys/debian/control
+++ b/dilos/tdetoys/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: tdetoys-trinity
--- a/ubuntu/_base/applications/abakus/debian/control
+++ b/ubuntu/_base/applications/abakus/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de>
-Build-Depends: autotools-dev, debhelper (>= 9~), quilt, cdbs (>= 0.4.0), cmake, intltool | gettext (>= 0.19~), imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
+Build-Depends: autotools-dev, debhelper (>= 9~), quilt, cdbs (>= 0.4.0), cmake, intltool, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
 Standards-Version: 3.8.4

 Package: abakus-trinity
--- a/ubuntu/_base/applications/dolphin/debian/control
+++ b/ubuntu/_base/applications/dolphin/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev
 Standards-Version: 3.8.4

 Package: dolphin-trinity
--- a/ubuntu/_base/applications/filelight/debian/control
+++ b/ubuntu/_base/applications/filelight/debian/control
@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ral Snchez Siles <rasasi78@gmail.com>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, xutils, chrpath, quilt (>= 0.40), libltdl-dev
+Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool, tdelibs14-trinity-dev, xutils, chrpath, quilt (>= 0.40), libltdl-dev
 Homepage: http://www.methylblue.com/filelight/

 Package: filelight-trinity
--- a/ubuntu/_base/applications/katapult/debian/control
+++ b/ubuntu/_base/applications/katapult/debian/control
@ -2,7 +2,7 @@ Source: katapult-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libxi-dev, sharutils
+Build-Depends: cdbs (>= 0.4.46ubuntu5), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libxi-dev, sharutils
 Standards-Version: 3.8.4

 Package: katapult-trinity
--- a/ubuntu/_base/applications/kbarcode/debian/control
+++ b/ubuntu/_base/applications/kbarcode/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kbarcode-trinity
--- a/ubuntu/_base/applications/kbibtex/debian/control
+++ b/ubuntu/_base/applications/kbibtex/debian/control
@ -2,7 +2,7 @@ Source: kbibtex-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev
 Standards-Version: 3.9.0
 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git
--- a/ubuntu/_base/applications/kbiff/debian/control
+++ b/ubuntu/_base/applications/kbiff/debian/control
@ -2,7 +2,7 @@ Source: kbiff-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev (>= 4:3.4.2)
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev (>= 4:3.4.2)
 Standards-Version: 3.9.1

 Package: kbiff-trinity
--- a/ubuntu/_base/applications/kbookreader/debian/control
+++ b/ubuntu/_base/applications/kbookreader/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/

--- a/ubuntu/_base/applications/kcmautostart/debian/control
+++ b/ubuntu/_base/applications/kcmautostart/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kcontrol-autostart-trinity
--- a/ubuntu/_base/applications/kcpuload/debian/control
+++ b/ubuntu/_base/applications/kcpuload/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kcpuload-trinity
--- a/ubuntu/_base/applications/kdirstat/debian/control
+++ b/ubuntu/_base/applications/kdirstat/debian/control
@ -2,7 +2,7 @@ Source: kdirstat-trinity
 Section: misc
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.41), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://kdirstat.sourceforge.net/

--- a/ubuntu/_base/applications/kiosktool/debian/control
+++ b/ubuntu/_base/applications/kiosktool/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kiosktool-trinity
--- a/ubuntu/_base/applications/kkbswitch/debian/control
+++ b/ubuntu/_base/applications/kkbswitch/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org>
 Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libxkbfile-dev
+Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool, tdelibs14-trinity-dev, libxkbfile-dev
 Standards-Version: 3.7.3
 Homepage: http://kkbswitch.sourceforge.net/

--- a/ubuntu/_base/applications/knetload/debian/control
+++ b/ubuntu/_base/applications/knetload/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev (>= 4:3.4.2), libltdl-dev
 Standards-Version: 3.8.4

 Package: knetload-trinity
--- a/ubuntu/_base/applications/knetstats/debian/control
+++ b/ubuntu/_base/applications/knetstats/debian/control
@ -2,7 +2,7 @@ Source: knetstats-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knetstats.sourceforge.net/

--- a/ubuntu/_base/applications/knights/debian/control
+++ b/ubuntu/_base/applications/knights/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br>
 Uploaders: Ola Lundqvist <opal@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/

--- a/ubuntu/_base/applications/knmap/debian/control
+++ b/ubuntu/_base/applications/knmap/debian/control
@ -2,7 +2,7 @@ Source: knmap-trinity
 Section: tde
 Priority: extra
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.2

 Package: knmap-trinity
--- a/ubuntu/_base/applications/knowit/debian/control
+++ b/ubuntu/_base/applications/knowit/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://knowit.sourceforge.net/

--- a/ubuntu/_base/applications/knutclient/debian/control
+++ b/ubuntu/_base/applications/knutclient/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, cmake, intltool, tdelibs14-trinity-dev
 Homepage: http://www.knut.noveradsl.cz/knutclient/

 Package: knutclient-trinity
--- a/ubuntu/_base/applications/kpicosim/debian/control
+++ b/ubuntu/_base/applications/kpicosim/debian/control
@ -2,7 +2,7 @@ Source: kpicosim-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: kpicosim-trinity
--- a/ubuntu/_base/applications/krename/debian/control
+++ b/ubuntu/_base/applications/krename/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Richard A. Johnson <nixternal@ubuntu.com> 
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl
 Standards-Version: 3.8.4

 Package: krename-trinity
--- a/ubuntu/_base/applications/ksensors/debian/control
+++ b/ubuntu/_base/applications/ksensors/debian/control
@ -2,7 +2,7 @@ Source: ksensors-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3

--- a/ubuntu/_base/applications/kshutdown/debian/control
+++ b/ubuntu/_base/applications/kshutdown/debian/control
@ -2,7 +2,7 @@ Source: kshutdown-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.1

 Package: kshutdown-trinity
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/control
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdebase-trinity-dev, ksplash-trinity
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdebase-trinity-dev, ksplash-trinity
 Standards-Version: 3.8.4

 Package: ksplash-engine-moodin-trinity
--- a/ubuntu/_base/applications/kvkbd/debian/control
+++ b/ubuntu/_base/applications/kvkbd/debian/control
@ -2,7 +2,7 @@ Source: kvkbd-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), libxtst-dev, tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, libxtst-dev, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://pan4os.info/main/index.php

--- a/ubuntu/_base/applications/kvpnc/debian/control
+++ b/ubuntu/_base/applications/kvpnc/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev
 Standards-Version: 3.8.4

 Package: kvpnc-trinity
--- a/ubuntu/_base/applications/mplayerthumbs/debian/control
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/control
@ -2,7 +2,7 @@ Source: mplayerthumbs-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.2

 Package: mplayerthumbs-trinity
--- a/ubuntu/_base/applications/potracegui/debian/control
+++ b/ubuntu/_base/applications/potracegui/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net>
 Uploaders: Bartosz Fenski <fenio@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: potracegui-trinity
--- a/ubuntu/_base/applications/tdedocker/debian/control
+++ b/ubuntu/_base/applications/tdedocker/debian/control
@ -2,7 +2,7 @@ Source: tdedocker-trinity
 Section: x11
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs-trinity-dev, libxpm-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs-trinity-dev, libxpm-dev
 Standards-Version: 3.7.2

 Package: tdedocker-trinity
--- a/ubuntu/_base/applications/tdeio-apt/debian/control
+++ b/ubuntu/_base/applications/tdeio-apt/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: tdeio-apt-trinity
--- a/ubuntu/_base/applications/tdeio-sword/debian/control
+++ b/ubuntu/_base/applications/tdeio-sword/debian/control
@ -2,7 +2,7 @@ Source: tdeio-sword-trinity
 Section: tde
 Priority: extra
 Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool | gettext (>= 0.19~), libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, intltool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev
 Standards-Version: 3.7.2

 Package: tdeio-sword-trinity
--- a/ubuntu/_base/applications/tdmtheme/debian/control
+++ b/ubuntu/_base/applications/tdmtheme/debian/control
@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>,
 Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://beta.smileaf.org/projects

--- a/ubuntu/_base/applications/wlassistant/debian/control
+++ b/ubuntu/_base/applications/wlassistant/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
+Build-Depends: debhelper (>= 9~), cdbs, quilt, cmake, intltool, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
 Standards-Version: 3.8.4

 Package: wlassistant-trinity
--- a/ubuntu/_base/applications/yakuake/debian/control
+++ b/ubuntu/_base/applications/yakuake/debian/control
@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://extragear.kde.org/apps/yakuake/

--- a/ubuntu/_base/tdetoys/debian/control
+++ b/ubuntu/_base/tdetoys/debian/control
@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool | gettext (>= 0.19~), tdelibs14-trinity-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev
 Standards-Version: 3.8.4

 Package: tdetoys-trinity