[SCM] kio packaging branch, master, updated. debian/5.22.0-1-4-g5b57f99

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=5b57f99

The following commit has been merged in the master branch:
commit 5b57f9997123bb577ae9033be9339aa8a26e08e4
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jul 8 12:22:13 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                                    | 10 ++++++++++
 debian/{kio-dev.acc.in => libkf5kio-dev.acc.in}   |  0
 debian/{kio-dev.install => libkf5kio-dev.install} |  0
 4 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6084dc..03aca46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kio (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:53:52 +0200
+
 kio (5.23.0-1) unstable; urgency=medium
 
   [ Automatic packaging ]
diff --git a/debian/control b/debian/control
index 9416035..b131934 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,14 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kio.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kio.git
 
 Package: kio-dev
+Depends: libkf5kio-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: libkf5kio-dev
 Section: libdevel
 Architecture: any
 Depends: kio (= ${binary:Version}),
@@ -59,6 +67,8 @@ Depends: kio (= ${binary:Version}),
          libkf5xmlgui-dev (>= 5.23.0~),
          qtbase5-dev (>= 5.4.0~),
          ${misc:Depends}
+Breaks: kio-dev (<< 5.23.0-2~)
+Replaces: kio-dev (<< 5.23.0-2~)
 Description: Resource and network access abstraction.
  KDE Input/Output framework provides a single API for
  operating on files, whether local or on a remote server.
diff --git a/debian/kio-dev.acc.in b/debian/libkf5kio-dev.acc.in
similarity index 100%
rename from debian/kio-dev.acc.in
rename to debian/libkf5kio-dev.acc.in
diff --git a/debian/kio-dev.install b/debian/libkf5kio-dev.install
similarity index 100%
rename from debian/kio-dev.install
rename to debian/libkf5kio-dev.install

-- 
kio packaging