Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

3 files changed, 14 insertions, 21 deletions

diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 07760541d..16d2c2e6b 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -5,9 +5,9 @@ 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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-trinity-dev (>= 4:3.5.10), binutils-dev, bison, flex,
- tdepim-trinity-dev (>= 4:3.5.10), libapr1-dev, libkcal2-trinity-dev (>= 4:3.5.10),
- libktnef1-trinity-dev (>= 4:3.5.10), libsvn-dev, libdb-dev,
+ gettext, pkg-config, tdelibs4-trinity-dev, binutils-dev, bison, flex,
+ tdepim-trinity-dev, libapr1-dev, libkcal2-trinity-dev,
+ libktnef1-trinity-dev, libsvn-dev, libdb-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
@@ -73,7 +73,7 @@ Section: devel
 Replaces: kapptemplate-trinity (<< 4:14.0.0)
 Breaks: kapptemplate-trinity (<< 4:14.0.0)
 Conflicts: kapptemplate
-Recommends: automake1.9 | automaken, tdelibs4-trinity-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-trinity-dev
 Description: creates a framework to develop a Trinity application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -111,7 +111,7 @@ Architecture: any
 Section: libdevel
 Replaces: kbabel-trinity-dev (<< 4:14.0.0)
 Breaks: kbabel-trinity-dev (<< 4:14.0.0)
-Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: kbabel-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: kbabel
 Description: PO-file editing suite for Trinity (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -282,7 +282,7 @@ Architecture: any
 Section: devel
 Replaces: kspy-trinity (<< 4:14.0.0)
 Breaks: kspy-trinity (<< 4:14.0.0)
-Depends: ${shlibs:Depends}, tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-trinity-dev
 Conflicts: kspy
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
@@ -340,7 +340,7 @@ Architecture: any
 Section: libdevel
 Replaces: libcvsservice-trinity-dev (<< 4:14.0.0)
 Breaks: libcvsservice-trinity-dev (<< 4:14.0.0)
-Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev (>= 4:3.5.8)
+Depends: libcvsservice0-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Conflicts: libcvsservice-dev
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/ubuntu/maverick/tdesdk/debian/control.in b/ubuntu/maverick/tdesdk/debian/control.in
index 7680adce7..6aaa2bce3 100644
--- a/ubuntu/maverick/tdesdk/debian/control.in
+++ b/ubuntu/maverick/tdesdk/debian/control.in
@@ -5,9 +5,9 @@ Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk,
- gettext, pkg-config, tdelibs4-dev (>= 4:3.5.8), binutils-dev, bison, flex,
- tdepim-dev (>= 4:3.5.8), libapr1-dev, libkcal2-dev (>= 4:3.5.8),
- libktnef1-dev (>= 4:3.5.8), libsvn-dev
+ gettext, pkg-config, tdelibs4-dev, binutils-dev, bison, flex,
+ tdepim-dev, libapr1-dev, libkcal2-dev,
+ libktnef1-dev, libsvn-dev
 Standards-Version: 3.7.2
 
 Package: tdesdk
@@ -63,7 +63,7 @@ Description: a graphical CVS front end for KDE
 Package: kapptemplate
 Architecture: all
 Section: devel
-Recommends: automake1.9 | automaken, tdelibs4-dev (>= 4:3.5.8)
+Recommends: automake1.9 | automaken, tdelibs4-dev
 Description: creates a framework to develop a KDE application
  KAppTemplate is a shell script that will create the necessary
  framework to develop various KDE applications.  It takes care of the
@@ -96,7 +96,7 @@ Description: PO-file editing suite for KDE
 Package: kbabel-dev
 Architecture: any
 Section: libdevel
-Depends: kbabel (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: kbabel (= ${Source-Version}), tdelibs4-dev
 Replaces: kbabel (<< 4:3.0.8-0)
 Description: PO-file editing suite for KDE (development files)
  This is a suite of programs for editing gettext message files (PO-files).
@@ -245,7 +245,7 @@ Description: a KDE GUI for viewing differences between files
 Package: kspy
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, tdelibs4-dev (>= 4:3.5.8)
+Depends: ${shlibs:Depends}, tdelibs4-dev
 Description: examines the internal state of a Qt/KDE app
  KSpy is a tiny library which can be used to graphically display
  the QObjects in use by a Qt/KDE app.  In addition to the object tree,
@@ -295,7 +295,7 @@ Description: DCOP service for accessing CVS repositories
 Package: libcvsservice-dev
 Architecture: any
 Section: libdevel
-Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8)
+Depends: libcvsservice0 (= ${Source-Version}), tdelibs4-dev
 Replaces: cervisia (<< 4:3.2.0)
 Description: development files for CVS DCOP service
  The library libcvsservice provides a DCOP service for accessing and
diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules
index d63a59865..5a7eda7d0 100755
--- a/ubuntu/maverick/tdesdk/debian/rules
+++ b/ubuntu/maverick/tdesdk/debian/rules
@@ -18,13 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
 
 PACKAGES_WITH_LIBS := kbabel-trinity kompare-trinity kspy-trinity kunittest-trinity libcvsservice0-trinity umbrello-trinity
 
-DEB_DH_MAKESHLIBS_ARGS_kbabel-trinity			:= -V'kbabel-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kompare-trinity			:= -V'kompare-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kspy-trinity			:= -V'kspy-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_kunittest-trinity			:= -V'kunittest-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_libcvsservice0-trinity		:= -V'libcvsservice0-trinity (>= 4:3.5.8-1)'
-DEB_DH_MAKESHLIBS_ARGS_umbrello-trinity			:= -V'umbrello-trinity (>= 4:3.5.8-1)'
-
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))