[SCM] plasma-desktop packaging branch, kubuntu_unstable, updated. 60cdbad3b4cac5cbbabe6b7b7f555c9e0e1d00b2

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=60cdbad

The following commit has been merged in the kubuntu_unstable branch:
commit 60cdbad3b4cac5cbbabe6b7b7f555c9e0e1d00b2
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 27 10:54:12 2015 +0100

    try to fix the transition from touchpad kcm
    
    - new transitional package kde-config-touchpad (last name it used)
    - until further notice plasma-desktop* needs to break/replace
      << source:Version of the new transitional. the problem underlying is that
      since the CI versions are changelog_version+git123 and changelog_version
      presently is still 5.2.x we'd open ourselfs up for bogus relationships
      as stable continues to CI the kcm as a standalone source moving its
      version along. same applies for upstream releases, they'd suddenly also
      be greater than whatever version I'd hardcode now.
      so, for now at least we need a very flexible substvar to force an
      appropriate transition
    - also update descriptions and whatnot to match what wiki.debian suggests
---
 debian/control | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index c3169ca..117a4ee 100644
--- a/debian/control
+++ b/debian/control
@@ -59,10 +59,8 @@ Depends: libkfontinst5 (= ${binary:Version}),
          plasma-desktop (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kde-config-touchpad (<< 4:5.2.50),
-        kde-touchpad (<< 5.1.95~)
-Replaces: kde-config-touchpad (<< 4:5.2.50),
-          kde-touchpad (<< 5.1.95~)
+Breaks: kde-config-touchpad (<< ${source:Version}), kde-touchpad (<< 5.1.95~)
+Replaces: kde-config-touchpad (<< ${source:Version}), kde-touchpad (<< 5.1.95~)
 Description: Tools and widgets for the desktop
  Plasma Desktop offers a beautiful looking desktop
  that takes complete advantage of modern computing technology.
@@ -113,11 +111,11 @@ Recommends: bluedevil,
             ttf-oxygen-font-family,
             user-manager
 Breaks: baloo-kf5 (<< 5.5),
-        kde-config-touchpad (<< 4:5.2.50),
+        kde-config-touchpad (<< ${source:Version}),
         kde-touchpad (<< 5.1.95~),
         plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Replaces: baloo-kf5 (<< 5.5),
-          kde-config-touchpad (<< 4:5.2.50),
+          kde-config-touchpad (<< ${source:Version}),
           kde-touchpad (<< 5.1.95~),
           plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
 Conflicts: kde-workspace-bin
@@ -183,12 +181,19 @@ Description: Tools and widgets for the desktop data files
 
 Package: kde-touchpad
 Architecture: any
-Depends: plasma-desktop (>= ${source:Version}), ${misc:Depends}
+Depends: plasma-desktop, ${misc:Depends}
 Section: oldlibs
 Priority: extra
-Description: transitional package
- Transitional package for kde-touchpad, this package can be
- safely removed.
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: kde-config-touchpad
+Depends: plasma-desktop, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: plasma-desktop-dbg
 Section: debug

-- 
plasma-desktop packaging