[SCM] kfilemetadata packaging branch, kubuntu_stable, updated. 31b6a8dc20dd34e2534089c69798d67604ee2612

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kfilemetadata.git;a=commitdiff;h=31b6a8d

The following commit has been merged in the kubuntu_stable branch:
commit 31b6a8dc20dd34e2534089c69798d67604ee2612
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 26 17:51:57 2015 +0100

    Split translations into a data package to avoid file conflicts on soversion bumps and subsequently forgetting to add a conflict in the packaging
---
 debian/changelog                       |  3 +++
 debian/control                         | 17 ++++++++++++++---
 debian/libkf5filemetadata-data.install |  1 +
 debian/libkf5filemetadata3.install     |  1 -
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0335f3..1c5d0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ kfilemetadata-kf5 (5.6.0-0ubuntu1) UNRELEASED; urgency=medium
   * Fix Replace/Conflict of the library package libkf5filemetadata5
     (a previously incorrectly used name) to use an actual version,
     otherwise we cannot ever go there again
+  * Split translations into a data package to avoid file conflicts on
+    soversion bumps and subsequently forgetting to add a conflict in the
+    packaging
 
  -- Harald Sitter <sitter at kde.org>  Mon, 26 Jan 2015 13:58:41 +0100
 
diff --git a/debian/control b/debian/control
index 0fa7b98..cdc5b70 100644
--- a/debian/control
+++ b/debian/control
@@ -33,9 +33,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kfilemetadata.git
 Package: libkf5filemetadata3
 Section: libs
 Architecture: any
-Conflicts: libkf5filemetadata5 (<< 5.0.0a)
-Replaces: libkf5filemetadata5 (<< 5.0.0a)
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf5filemetadata-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Multi-Arch: same
 Recommends: libkf5filemetadata-bin (= ${binary:Version})
 Description: library for extracting file metadata
@@ -43,6 +43,17 @@ Description: library for extracting file metadata
  .
  kfilemetadata is part of the KDE Plasma desktop.
 
+Package: libkf5filemetadata-data
+Architecture: all
+Conflicts: libkf5filemetadata2 (<< 5.2.0), libkf5filemetadata5 (<< 5.0.0a)
+Replaces: libkf5filemetadata2 (<< 5.2.0), libkf5filemetadata5 (<< 5.0.0a)
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: foreign
+Description: library for extracting file metadata
+ This library is for extracting file metadata.
+ .
+ kfilemetadata is part of the KDE Plasma desktop.
+
 Package: libkf5filemetadata-bin
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libkf5filemetadata-data.install b/debian/libkf5filemetadata-data.install
new file mode 100644
index 0000000..f281f64
--- /dev/null
+++ b/debian/libkf5filemetadata-data.install
@@ -0,0 +1 @@
+usr/share/locale/*/LC_MESSAGES/
diff --git a/debian/libkf5filemetadata3.install b/debian/libkf5filemetadata3.install
index 95575f8..2a47d48 100644
--- a/debian/libkf5filemetadata3.install
+++ b/debian/libkf5filemetadata3.install
@@ -1,3 +1,2 @@
 usr/lib/*/libKF5FileMetaData.so.3
 usr/lib/*/libKF5FileMetaData.so.5*
-usr/share/locale/*/LC_MESSAGES/

-- 
kfilemetadata packaging