DEB: Replace remaining python, python-dev and python-dbg

with python-all, python-dev-all and python-dbg-all.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 892ada12716f25c37ad5afcccaee73ec0161808a)

12 files changed, 20 insertions, 20 deletions

diff --git a/ubuntu/_base/applications/amarok/debian/control b/ubuntu/_base/applications/amarok/debian/control
index 82cbff77b..54deec176 100644
--- a/ubuntu/_base/applications/amarok/debian/control
+++ b/ubuntu/_base/applications/amarok/debian/control
@@ -22,7 +22,7 @@ Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trini
 Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~)
 Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
+ python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins
 Description: versatile and easy to use audio player for Trinity
  Amarok tries to be a little different, providing a simple drag and drop
  interface that really makes playlist handling easy.
@@ -52,7 +52,7 @@ Depends: ruby
 Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~)
 Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby-trinity, python, python-tqt
+Suggests: libqt0-ruby-trinity, python-all, python-tqt
 Description: architecture independent files for Amarok [Trinity]
  This package contains architecture independent files needed for Amarok to run
  properly. It also provides Amarok documentation. Therefore, unless you have
diff --git a/ubuntu/_base/applications/desktop-effects-tde/debian/control b/ubuntu/_base/applications/desktop-effects-tde/debian/control
index 606b13ff9..eb766bc93 100644
--- a/ubuntu/_base/applications/desktop-effects-tde/debian/control
+++ b/ubuntu/_base/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
+Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 7.0.50~), python-support (>= 0.6) | python-all-dev
 Standards-Version: 3.8.4
 XS-Python-Version: all
 
diff --git a/ubuntu/_base/applications/koffice/debian/control b/ubuntu/_base/applications/koffice/debian/control
index 92e68c718..d77eb4f35 100644
--- a/ubuntu/_base/applications/koffice/debian/control
+++ b/ubuntu/_base/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Ral Snchez Siles <[email protected]>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 7.0.50~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 7.0.50~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-all-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
@@ -303,7 +303,7 @@ Section: libs
 Replaces: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
 Breaks: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}~), koffice-data-trinity (<< ${TDE-Next-Version3}~)
-Recommends: latex-xft-fonts, ruby, python
+Recommends: latex-xft-fonts, ruby, python-all
 Suggests: wordnet, texlive-base
 Description: common libraries and binaries for the Trinity Office Suite [Trinity]
  This package provides the libraries and binaries that are shared amongst
diff --git a/ubuntu/_base/applications/konversation/debian/control b/ubuntu/_base/applications/konversation/debian/control
index 6a2afde2d..d790c561d 100644
--- a/ubuntu/_base/applications/konversation/debian/control
+++ b/ubuntu/_base/applications/konversation/debian/control
@@ -14,7 +14,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: konversation-kde3 (<< 4:14.0.0~), konversation-trinity (<< 4:14.0.0~)
 Breaks: konversation-kde3 (<< 4:14.0.0~), konversation-trinity (<< 4:14.0.0~)
-Recommends: python, ruby
+Recommends: python-all, ruby
 Suggests: libsoap-lite-perl
 Description: user friendly Internet Relay Chat (IRC) client for TDE [Trinity]
  Konversation is a client for the Internet Relay Chat (IRC) protocol.
diff --git a/ubuntu/_base/applications/tde-guidance/debian/control b/ubuntu/_base/applications/tde-guidance/debian/control
index 668946d8b..390704b9a 100644
--- a/ubuntu/_base/applications/tde-guidance/debian/control
+++ b/ubuntu/_base/applications/tde-guidance/debian/control
@@ -7,12 +7,12 @@ Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]>
 Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, chrpath, tdelibs14-trinity-dev,
  libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
  pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
- python-support (>= 0.6) | dh-python, python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
+ python-support (>= 0.6) | dh-python, python-all, python-all-dev, x11proto-scrnsaver-dev, python-tqt-dev, hwdata
 Standards-Version: 3.8.4
 
 Package: tde-guidance-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, init | sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, init | sysv-rc, guidance-backends-trinity, hwdata, python-all, python-all-dev
 Replaces: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
 Breaks: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
@@ -32,7 +32,7 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit
 
 Package: guidance-backends-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python-all, python-all-dev
 Replaces: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
 Breaks: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~)
 Conflicts: guidance-power-manager, kde-guidance-powermanager
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio-locate/debian/control
index 45624544c..2f608c694 100644
--- a/ubuntu/_base/applications/tdeio-locate/debian/control
+++ b/ubuntu/_base/applications/tdeio-locate/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Tobi Vollebregt <[email protected]>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, bzip2, python-all, cmake
 Standards-Version: 3.8.4
 
 Package: tdeio-locate-trinity
diff --git a/ubuntu/_base/applications/tellico/debian/control b/ubuntu/_base/applications/tellico/debian/control
index fc3c025bc..81078f2c5 100644
--- a/ubuntu/_base/applications/tellico/debian/control
+++ b/ubuntu/_base/applications/tellico/debian/control
@@ -36,7 +36,7 @@ Depends: tdelibs-data-trinity
 Replaces: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~)
 Breaks: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~)
 Recommends: tellico-trinity
-Suggests: python
+Suggests: python-all
 Description: collection manager for books, videos, music [data] [Trinity]
  Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -59,7 +59,7 @@ Architecture: all
 Recommends: tellico-trinity
 Replaces: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~)
 Breaks: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~)
-Suggests: python, ruby
+Suggests: python-all, ruby
 Description: collection manager for books, videos, music [scripts] [Trinity]
  Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/control b/ubuntu/_base/libraries/pytdeextensions/debian/control
index b1ba63aaf..5b5c5b03d 100644
--- a/ubuntu/_base/libraries/pytdeextensions/debian/control
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <[email protected]>
 Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]>
 Build-Depends: cdbs, debhelper (>= 7.0.50~), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool,
  libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all, python-all-dev
 Standards-Version: 3.8.4
 
 Package: pytdeextensions-trinity
diff --git a/ubuntu/_base/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/python-trinity/debian/control
index 39522affe..3591760c3 100644
--- a/ubuntu/_base/libraries/python-trinity/debian/control
+++ b/ubuntu/_base/libraries/python-trinity/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <[email protected]>
 Uploaders: Torsten Marek <[email protected]>, Debian Python Modules Team <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), libtqtinterface-dev, python, python-all-dev, python-all-dbg, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
+Build-Depends: debhelper (>= 7.0.50~), libtqtinterface-dev, python-all, python-all-dev, python-all-dbg, python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg, python-tqt-dev, python-tqt-dbg, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php
 
diff --git a/ubuntu/_base/tdeaddons/debian/control b/ubuntu/_base/tdeaddons/debian/control
index 26f864593..89ac44f69 100644
--- a/ubuntu/_base/tdeaddons/debian/control
+++ b/ubuntu/_base/tdeaddons/debian/control
@@ -152,7 +152,7 @@ Architecture: all
 Section: tde
 Replaces: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~)
 Breaks: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl
+Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl
 Recommends: knewsticker-trinity
 Enhances: knewsticker-trinity
 Description: scripts for KNewsTicker, the Trinity news ticker
@@ -171,7 +171,7 @@ Architecture: any
 Section: tde
 Replaces: konq-plugins-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~)
 Breaks: konq-plugins-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python, rsync, unison
+Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison
 Recommends: akregator-trinity, ark-trinity, imagemagick
 Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html
 Enhances: konqueror-trinity, akregator-trinity
diff --git a/ubuntu/_base/tdesdk/debian/control b/ubuntu/_base/tdesdk/debian/control
index f29b7d17b..29b8de795 100644
--- a/ubuntu/_base/tdesdk/debian/control
+++ b/ubuntu/_base/tdesdk/debian/control
@@ -166,7 +166,7 @@ Architecture: all
 Section: devel
 Replaces: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~)
 Breaks: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, php-cli | php5-cli, python
+Depends: ${perl:Depends}, php-cli | php5-cli, python-all
 Recommends: tdecachegrind-trinity
 Description: format converters for TDECachegrind profiling visualisation tool
  This is a collection of scripts for converting the output from
@@ -220,7 +220,7 @@ Architecture: all
 Section: devel
 Replaces: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~)
 Breaks: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~)
-Depends: ${perl:Depends}, python
+Depends: ${perl:Depends}, python-all
 Recommends: automake1.9 | automaken, cvs, gawk
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-trinity-doc, tqt3-doc, valgrind, devscripts
 Enhances: kate-trinity
diff --git a/ubuntu/_base/tdevelop/debian/control b/ubuntu/_base/tdevelop/debian/control
index 9879b9db4..814a4b179 100644
--- a/ubuntu/_base/tdevelop/debian/control
+++ b/ubuntu/_base/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Jeremy Lain <[email protected]>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python, g++, kdevdesigner-trinity
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python-all, g++, kdevdesigner-trinity
 Description: An IDE for Unix/X11
  TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features