Fix libtqt-perl packaging on Debian and Ubuntu

5 files changed, 13 insertions, 17 deletions

diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/maverick/applications/adept/debian/control
index f14bf6ffd..20a981c38 100644
--- a/ubuntu/maverick/applications/adept/debian/control
+++ b/ubuntu/maverick/applications/adept/debian/control
@@ -34,7 +34,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Replaces: adept-manager-kde3 (<< 4:3.5.13)
 Breaks: adept-manager-kde3 (<< 4:3.5.13)
-Recommends: libqt-perl
+Recommends: libtqt-perl
 Architecture: any
 Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
@@ -45,7 +45,7 @@ Description: package manager for Trinity
   * Edit the list of used repositories (sources.list)
   * Configure packages through the debconf system
  .
- Please also install libqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the KDE Debconf frontend
  to function.
 
 Package: adept-installer-trinity
@@ -53,7 +53,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Replaces: adept-installer-kde3 (<< 4:3.5.13)
 Breaks: adept-installer-kde3 (<< 4:3.5.13)
-Recommends: libqt-perl
+Recommends: libtqt-perl
 Architecture: any
 Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
@@ -61,7 +61,7 @@ Description: simple user interface for application management (for Trinity)
  that contains a .desktop file for use with KDE, GNOME or other
  desktop environment.
  .
- Please also install libqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the KDE Debconf frontend
  to function.
 
 Package: adept-updater-trinity
@@ -69,13 +69,13 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Replaces: adept-updater-kde3 (<< 4:3.5.13)
 Breaks: adept-updater-kde3 (<< 4:3.5.13)
-Recommends: libqt-perl
+Recommends: libtqt-perl
 Architecture: any
 Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
- Please also install libqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the KDE Debconf frontend
  to function.
 
 Package: adept-notifier-trinity
diff --git a/ubuntu/maverick/applications/adept/debian/control.in b/ubuntu/maverick/applications/adept/debian/control.in
index a313fdbae..d272f82b2 100644
--- a/ubuntu/maverick/applications/adept/debian/control.in
+++ b/ubuntu/maverick/applications/adept/debian/control.in
@@ -28,7 +28,7 @@ Description: package manager for Trinity -- common files
 Package: adept-manager-trinity
 Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
-Recommends: libqt-perl
+Recommends: libtqt-perl
 Architecture: any
 Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
@@ -39,13 +39,13 @@ Description: package manager for Trinity
   * Edit the list of used repositories (sources.list)
   * Configure packages through the debconf system
  .
- Please also install libqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the KDE Debconf frontend
  to function.
 
 Package: adept-installer-trinity
 Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
-Recommends: libqt-perl
+Recommends: libtqt-perl
 Architecture: any
 Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
@@ -53,19 +53,19 @@ Description: simple user interface for application management (for Trinity)
  that contains a .desktop file for use with KDE, GNOME or other
  desktop environment.
  .
- Please also install libqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the KDE Debconf frontend
  to function.
 
 Package: adept-updater-trinity
 Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
-Recommends: libqt-perl
+Recommends: libtqt-perl
 Architecture: any
 Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
- Please also install libqt-perl if you want the KDE Debconf frontend
+ Please also install libtqt-perl if you want the KDE Debconf frontend
  to function.
 
 Package: adept-notifier-trinity
diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/control b/ubuntu/maverick/libraries/libtqt-perl/debian/control
index d392052db..3277f09e6 100644
--- a/ubuntu/maverick/libraries/libtqt-perl/debian/control
+++ b/ubuntu/maverick/libraries/libtqt-perl/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Bart Martens <[email protected]>
 Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2)
-Build-Conflicts: libqt-perl
+Build-Conflicts: libtqt-perl
 Standards-Version: 3.8.4
 
 Package: libtqt-perl
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control
index f16386120..89d7fda52 100644
--- a/ubuntu/maverick/tdebindings/debian/control
+++ b/ubuntu/maverick/tdebindings/debian/control
@@ -130,7 +130,6 @@ Section: libs
 Replaces: libsmokeqt1-kde3 (<< 4:3.5.13)
 Breaks: libsmokeqt1-kde3 (<< 4:3.5.13)
 Depends: ${shlibs:Depends}
-Conflicts: libqt-perl (<= 3.008-1)
 Description: SMOKE Binding Library to Qt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
@@ -144,7 +143,6 @@ Section: libdevel
 Replaces: libsmokeqt-kde3-dev (<< 4:3.5.13)
 Breaks: libsmokeqt-kde3-dev (<< 4:3.5.13)
 Depends: libsmokeqt1-trinity (= ${binary:Version})
-Conflicts: libqt-perl (<= 3.008-1)
 Description: SMOKE Binding Library to Qt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various TDE language bindings packages to provide interfaces to the
diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in
index b9f3e717a..998cde21d 100644
--- a/ubuntu/maverick/tdebindings/debian/control.in
+++ b/ubuntu/maverick/tdebindings/debian/control.in
@@ -112,7 +112,6 @@ Package: libsmokeqt1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libqt-perl (<= 3.008-1)
 Description: SMOKE Binding Library to Qt
  The "Scripting Meta Object Kompiler Engine" library is used by
  various KDE language bindings packages to provide interfaces to the
@@ -124,7 +123,6 @@ Package: libsmokeqt-dev
 Architecture: any
 Section: libdevel
 Depends: libsmokeqt1 (= ${binary:Version})
-Conflicts: libqt-perl (<= 3.008-1)
 Description: SMOKE Binding Library to Qt - Development Files
  The "Scripting Meta Object Kompiler Engine" library is used by
  various KDE language bindings packages to provide interfaces to the