1 files changed, 18 insertions, 32 deletions
diff --git a/debian/_base/dependencies/tqt3/debian/control b/debian/_base/dependencies/tqt3/debian/control
index bdae88783..cfb831620 100644
--- a/debian/_base/dependencies/tqt3/debian/control
+++ b/debian/_base/dependencies/tqt3/debian/control
@@ -1,8 +1,8 @@
 Source: tqt-x11-free
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
  libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
  libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
@@ -124,7 +124,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev, libc6-dev, libtqt3-mt (= ${binary:Version}),
  libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version})
-Recommends: libtqt3-compat-headers, libcups2-dev
+Recommends: libcups2-dev
 Suggests: libtqt3-i18n, tqt3-doc
 Description: TQt development files (Threaded)
  TQt is a C++ class library optimized for graphical user interface
@@ -132,13 +132,6 @@ Description: TQt development files (Threaded)
  for building threaded TQt applications as well as the libtqui.so symlink
  and the necessary header files for libtqui.so. (See README.Debian and
  the TQt Documentation for instructions on libtqui.so)
- .
- WARNING: If you plan to build some older TQt3 applications, you will
- most probably have to install the libtqt3-compat-headers package. It
- contains all the headers which are not part of the official TQt3 API
- anymore but which are still used by some programs. So if you encounter
- problems with missing header files, please install this package first
- before you send a bugreport.
 
 Package: libtqt3-headers
 Architecture: all
@@ -152,23 +145,6 @@ Description:  TQt3 header files
  with TQt3. If you want to compile or develop programs which use TQt3, you
  have to install this package.
 
-Package: libtqt3-compat-headers
-Architecture: all
-Multi-Arch: foreign
-Section: devel
-Replaces: libtqt3-compat-headers (<< 4:14.0.0~)
-Breaks: libtqt3-compat-headers (<< 4:14.0.0~)
-Depends: libtqt3-headers (= ${binary:Version})
-Recommends: libtqt3-mt-dev
-Description: TQt 1.x and 2.x compatibility includes
- This package contains header files that are intended for build
- compatibility for applications that build with TQt3 but still use
- deprecated includes. It is meant as an intermediate solution and
- these header files are not part of the official TQt3 API.
- All sourcecode that is still using the headers of this package is
- subject to be changed to use the new header files which are in
- libtqt3-headers.
-
 Package: tqt3-dev-tools
 Architecture: any
 Multi-Arch: foreign
@@ -210,17 +186,27 @@ Depends: ${shlibs:Depends}
 Description: TQt3 Designer plugins
  This package contains plugins for TQt3 Designer
 
+Package: libtqt3-apps-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Conflicts: tqt3-apps-dev (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version})
+Description: TQt3 Developer applications development libraries
+ This package contains additional libraries that ship with the applications
+ included with TQt - the TQt Designer and the TQt Assistant.
+
 Package: tqt3-apps-dev
 Architecture: any
 Multi-Arch: no
 Section: devel
 Replaces: tqt3-apps-dev (<< 4:14.0.0~)
 Breaks: tqt3-apps-dev (<< 4:14.0.0~)
-Depends: libtqt3-mt-dev
+Depends: libtqt3-mt-dev, libtqt3-apps-dev
 Description: TQt3 Developer applications development files
  This package is intended for developers who want to develop applications
- using the additional static libraries that ship with the applications
- included with TQt; the TQt Designer and the TQt Assistant.
+ using the additional libraries that ship with the applications
+ included with TQt - the TQt Designer and the TQt Assistant.
  It allows integrating additional enhancements into the TQt Designer
  respectively faciliate the TQt Assistant from within your TQt application
  to interactively call the Assistant for displaying online help that the
@@ -299,7 +285,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~)
 Recommends: libtqt3-mt-dev
 Depends: ${shlibs:Depends}
 Description: Conversion utilities for TQt3 development
- This package contains some older TQt tools (namely tqtrename140,
+ This package contains some older TQt tools (namely
  tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by
  application developers who need to migrate any TQt application written
  for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to
@@ -313,7 +299,7 @@ Multi-Arch: foreign
 Section: libs
 Replaces: libtqt3-i18n (<< 4:14.0.0~)
 Breaks: libtqt3-i18n (<< 4:14.0.0~)
-Recommends: libtqt3-mt
+Recommends: libtqt3-mt | libtqt3-mt-t64
 Description: i18n files for TQt3 library
  This package contains the internationalization files for the TQt library.
  TQt applications that are internationalized will need to depend on this package