[SCM] kwayland packaging branch, master, updated. debian/5.22.0-1-10-g0c9f9d6

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwayland.git;a=commitdiff;h=0c9f9d6

The following commit has been merged in the master branch:
commit 0c9f9d6c27fce652b09c38c04fd2c129f28f867e
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jul 8 12:21:05 2016 +0200

    change dev package name to cmake package name
    
    as discussed at munich sprint.
    
    rationale:
    The majority of KF5 libraries are one library with a matching cmake package
    name (e.g. kconfig = libkf5config = cmake/kf5config). To a user this
    paints a picture where this equality is always true so that if
    cmake complains about missing KF5Wayland they want to install
    libkf5wayland-dev to meet that requirement. This will however fail because
    of the general naming rule we employ (i.e. single lib => libname-dev;
    multilib => sourcename-dev) as kwayland produces two libraries its dev
    package is called kwayland-dev rather than libkf5wayland-dev. This is
    not obvious to users and causes to them unreasonable inconsistency.
    Additionally it increases the entry barrier to packaging as a whole as
    one needs to be aware of the -dev naming rule or else multilib sources
    will seem equally out of line with the rest of frameworks. To that extend
    even knowing this a packager would have to remember the frameworks that
    are multilib or have to look up the correct names each time when writing
    a new control file or expanding it with new build depends.
    To increase overall consistency all frameworks are now to reflect their
    cmake package name in the -dev package name. This is because cmake is
    expected to be the primary method of consumption for frameworks and even
    when using qmake the metadata is split per-library anyway, so they have
    no common naming consistency underlying them.
    
    This change updates the -dev name to align with expectation and introduces
    a transitional dummy package to help with the transition.
---
 debian/changelog                                           |  8 ++++++++
 debian/control                                             | 12 +++++++++++-
 debian/{kwayland-dev.acc.in => libkf5wayland-dev.acc.in}   |  0
 debian/{kwayland-dev.install => libkf5wayland-dev.install} |  0
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6414aa9..64dbec8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kwayland (4:5.23.0-2) UNRELEASED; urgency=medium
+
+  * Rename -dev package to align with the cmake package name for
+    greater discoverability and consistency across frameworks.
+    Add a transitional package to help with the name transition.
+
+ -- Harald Sitter <sitter at kde.org>  Tue, 14 Jun 2016 12:45:50 +0200
+
 kwayland (4:5.23.0-1) unstable; urgency=medium
 
   [ Automatic packaging ]
diff --git a/debian/control b/debian/control
index 7750ea6..aa02345 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: https://projects.kde.org/projects/kde/workspace/kwayland
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kwayland.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kwayland.git
 
-Package: kwayland-dev
+Package: libkf5wayland-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5waylandclient5 (= ${binary:Version}),
@@ -25,12 +25,22 @@ Depends: libkf5waylandclient5 (= ${binary:Version}),
          qtbase5-dev (>= 5.4.0~),
          ${misc:Depends},
          ${shlibs:Depends}
+Replaces: kwayland-dev (<< 4:5.23.0-2~)
+Breaks: kwayland-dev (<< 4:5.23.0-2~)
 Description: development files for kwayland
  KWayland provides a Qt-style Client and Server library wrapper for
  the Wayland libraries.
  .
  Contains development files for kwayland.
 
+Package: kwayland-dev
+Depends: libkf5wayland-dev, ${misc:Depends}
+Architecture: all
+Priority: extra
+Section: oldlibs
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
 Package: libkf5waylandclient5
 Architecture: any
 Multi-Arch: same
diff --git a/debian/kwayland-dev.acc.in b/debian/libkf5wayland-dev.acc.in
similarity index 100%
rename from debian/kwayland-dev.acc.in
rename to debian/libkf5wayland-dev.acc.in
diff --git a/debian/kwayland-dev.install b/debian/libkf5wayland-dev.install
similarity index 100%
rename from debian/kwayland-dev.install
rename to debian/libkf5wayland-dev.install

-- 
kwayland packaging