[SCM] kfilemetadata packaging branch, kubuntu_vivid_archive, updated. 19412a3cd5729dd3bcd99215bbb2737ac5840587

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 19412a3cd5729dd3bcd99215bbb2737ac5840587
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 26 16:02:31 2015 +0100

    Soversion bump from 2 to 3
    
    * Soversion bump from 2 to 3
    * Rename all packages accordingly
    * Fix up install file accordingly
    * 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
---
 debian/changelog                                             |  6 ++++++
 debian/control                                               | 12 ++++++------
 ...bkf5filemetadata2.install => libkf5filemetadata3.install} |  0
 ...bkf5filemetadata2.symbols => libkf5filemetadata3.symbols} |  6 +-----
 debian/rules                                                 |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3523f4b..b0335f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 kfilemetadata-kf5 (5.6.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Soversion bump from 2 to 3
+  * Rename all packages accordingly
+  * Fix up install file accordingly
+  * 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
 
  -- Harald Sitter <sitter at kde.org>  Mon, 26 Jan 2015 13:58:41 +0100
 
diff --git a/debian/control b/debian/control
index 5476f8c..0fa7b98 100644
--- a/debian/control
+++ b/debian/control
@@ -30,11 +30,11 @@ Homepage: https://projects.kde.org/projects/kde/workspace/kfilemetadata
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/kfilemetadata.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kfilemetadata.git
 
-Package: libkf5filemetadata2
+Package: libkf5filemetadata3
 Section: libs
 Architecture: any
-Conflicts: libkf5filemetadata5
-Replaces: libkf5filemetadata5
+Conflicts: libkf5filemetadata5 (<< 5.0.0a)
+Replaces: libkf5filemetadata5 (<< 5.0.0a)
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: same
 Recommends: libkf5filemetadata-bin (= ${binary:Version})
@@ -57,7 +57,7 @@ Description: library for extracting file metadata
 Package: libkf5filemetadata-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5filemetadata2 (= ${binary:Version}),
+Depends: libkf5filemetadata3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: libkf5filemetadata1-dev
@@ -68,11 +68,11 @@ Description: library for extracting file metadata
  .
  This package contains the development files.
 
-Package: kf5filemetadata2-dbg
+Package: kf5filemetadata3-dbg
 Section: debug
 Architecture: any
 Recommends: qtbase5-dbg
-Depends: libkf5filemetadata2 (= ${binary:Version}), ${misc:Depends}
+Depends: libkf5filemetadata3 (= ${binary:Version}), ${misc:Depends}
 Description: library for extracting file metadata
  This library is for extracting file metadata.
  .
diff --git a/debian/libkf5filemetadata2.install b/debian/libkf5filemetadata3.install
similarity index 100%
rename from debian/libkf5filemetadata2.install
rename to debian/libkf5filemetadata3.install
diff --git a/debian/libkf5filemetadata2.symbols b/debian/libkf5filemetadata3.symbols
similarity index 95%
rename from debian/libkf5filemetadata2.symbols
rename to debian/libkf5filemetadata3.symbols
index 74650c7..06e6c7c 100644
--- a/debian/libkf5filemetadata2.symbols
+++ b/debian/libkf5filemetadata3.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 5.1.0.1 amd64
-libKF5FileMetaData.so.2 libkf5filemetadata2 #MINVER#
+libKF5FileMetaData.so.3 libkf5filemetadata3 #MINVER#
  _ZN13KFileMetaData12PropertyInfo8fromNameERK7QString at Base 5.0.0
  _ZN13KFileMetaData12PropertyInfoC1ENS_8Property8PropertyE at Base 5.0.0
  _ZN13KFileMetaData12PropertyInfoC1ERKS0_ at Base 5.0.0
@@ -8,15 +8,11 @@ libKF5FileMetaData.so.2 libkf5filemetadata2 #MINVER#
  _ZN13KFileMetaData12PropertyInfoD1Ev at Base 5.0.0
  _ZN13KFileMetaData12PropertyInfoD2Ev at Base 5.0.0
  _ZN13KFileMetaData12PropertyInfoaSERKS0_ at Base 5.0.2+git20140925
- _ZN13KFileMetaData12UserMetaData10removeTagsERK11QStringList at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaData12hasAttributeERK7QString at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaData12setAttributeERK7QStringS3_ at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaData14setUserCommentERK7QString at Base 5.1.0.1
- _ZN13KFileMetaData12UserMetaData6addTagERK7QString at Base 5.1.0.1
- _ZN13KFileMetaData12UserMetaData7addTagsERK11QStringList at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaData7setTagsERK11QStringList at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaData9attributeERK7QString at Base 5.1.0.1
- _ZN13KFileMetaData12UserMetaData9removeTagERK7QString at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaData9setRatingEi at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaDataC1ERK7QString at Base 5.1.0.1
  _ZN13KFileMetaData12UserMetaDataC1ERKS0_ at Base 5.1.0.1
diff --git a/debian/rules b/debian/rules
index 69c5bb0..1f637fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,6 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=kf5filemetadata2-dbg
+	$(overridden_command) --dbg-package=kf5filemetadata3-dbg
 
 .PHONY: override_dh_auto_test

-- 
kfilemetadata packaging