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

7 files changed, 7 insertions, 8 deletions

diff --git a/ubuntu/precise/tdelibs/debian/changelog b/ubuntu/precise/tdelibs/debian/changelog
index 847dfa152..7b2a98aa1 100644
--- a/ubuntu/precise/tdelibs/debian/changelog
+++ b/ubuntu/precise/tdelibs/debian/changelog
@@ -2010,7 +2010,7 @@ tdelibs (4:3.4.1-0ubuntu9) breezy; urgency=low
 
 tdelibs (4:3.4.1-0ubuntu8) breezy; urgency=low
 
-  * Add kubuntu_06_tdewallet_simplify_string.diff to simplify KWallet question
+  * Add kubuntu_06_tdewallet_simplify_string.diff to simplify TDEWallet question
   * Add kubuntu_07_rubberband.diff for pretty file manager selection
   * Add versioned build-dep on libxrender-dev and tighten version 
     build-dep of Qt to ensure libXrender.la changes
diff --git a/ubuntu/precise/tdelibs/debian/control b/ubuntu/precise/tdelibs/debian/control
index fd9246ac6..279e62d52 100644
--- a/ubuntu/precise/tdelibs/debian/control
+++ b/ubuntu/precise/tdelibs/debian/control
@@ -59,7 +59,6 @@ Package: tdelibs14-trinity
 Section: libs
 Architecture: any
 Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
-Provides: tdelibs4c2a-trinity
 Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0), kdelibs4c2a-trinity (<< 4:14.0.0), tdelibs4c2a-trinity
 Depends: ${shlibs:Depends}, tdelibs-data-trinity,
  tdelibs-data-trinity, libart-2.0-2 (>= 14.0.0), perl, xbase-clients, sudo
@@ -76,7 +75,7 @@ Description: core libraries and binaries for all TDE applications
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: tdelibs4-trinity-dev
+Package: tdelibs14-trinity-dev
 Section: libdevel
 Architecture: any
 Replaces: kdelibs4-kde3-dev (<< 4:14.0.0), kdelibs4-trinity-dev (<< 4:14.0.0)
@@ -89,7 +88,7 @@ Depends: tdelibs14-trinity (= ${Source-Version}), libart-2.0-dev (>= 14.0.0),
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libtqtinterface-dev,
- gettext-kde, libr-dev, libudev-dev, libdbus-1-tqt-dev
+ gettext-kde, libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev
 Provides: tdelibs-trinity-dev
 Description: development files for the TDE core libraries
  This package contains all the headers and other related files needed
@@ -99,7 +98,7 @@ Description: development files for the TDE core libraries
  This package is part of TDE, and a component of the TDE libraries module.
  See the 'kde-trinity' and 'tdelibs-trinity' packages for more information.
 
-Package: tdelibs4-trinity-doc
+Package: tdelibs14-trinity-doc
 Section: doc
 Architecture: all
 Replaces: kdelibs4-kde3-doc (<< 4:14.0.0), kdelibs4-trinity-doc (<< 4:14.0.0)
@@ -119,7 +118,7 @@ Architecture: any
 Replaces: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Breaks: kdelibs-kde3-dbg (<< 4:14.0.0), kdelibs-trinity-dbg (<< 4:14.0.0)
 Priority: extra
-Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs14-trinity-dbg
+Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
 Depends: tdelibs14-trinity (= ${Source-Version}), libtqtinterface-dbg, libc6-dbg [amd64]
 Description: debugging symbols for tdelibs
  This package contains the debugging symbols associated with tdelibs.
diff --git a/ubuntu/precise/tdelibs/debian/rules b/ubuntu/precise/tdelibs/debian/rules
index ff689557e..fe0cc4433 100755
--- a/ubuntu/precise/tdelibs/debian/rules
+++ b/ubuntu/precise/tdelibs/debian/rules
@@ -66,9 +66,9 @@ binary-install/tdelibs-data-trinity::
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-binary-predeb/tdelibs4-trinity-dev::
+binary-predeb/tdelibs14-trinity-dev::
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs4-trinity-dev.substvars
+	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
 endif
 
 common-install-prehook-impl::
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.docs b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-dev.docs
index 3d802584c..3d802584c 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.docs
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-dev.docs
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-dev.install
index 0ea3ec5f8..0ea3ec5f8 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-dev.install
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-dev.manpages
index 5f13f5b3f..5f13f5b3f 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-dev.manpages
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-dev.manpages
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-doc.install b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-doc.install
index 71ae7f63f..71ae7f63f 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4-trinity-doc.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs14-trinity-doc.install