[SCM] libkcddb packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-16-g75e5d5b

Harald Sitter apachelogger-guest at moszumanska.debian.org
Mon Aug 17 13:58:20 UTC 2015 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkcddb.git;a=commitdiff;h=75e5d5b

The following commit has been merged in the kubuntu_wily_archive branch:
commit 75e5d5ba9a9a15170c18877c38b016a8a903a302
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Aug 17 15:58:09 2015 +0200

    sync with archive
---
 debian/changelog                       |  8 ++++++++
 debian/libkcddb4.symbols               | 21 ++++++++++++---------
 debian/patches/libmusicbrainz5cc.patch | 16 ++++++++++++++++
 debian/patches/series                  |  1 +
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22e90e5..2c901c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ libkcddb (4:15.07.90-0ubuntu1) UNRELEASED; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 13 Aug 2015 11:39:16 +0100
 
+libkcddb (4:15.04.3-0ubuntu1) wily; urgency=medium
+
+  * New upstream version.
+  * New patch: libmusicbrainz5cc.patch (Closes: #791884)
+  * Update symbols file.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 14 Aug 2015 23:02:59 +0200
+
 libkcddb (4:15.04.2-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
diff --git a/debian/libkcddb4.symbols b/debian/libkcddb4.symbols
index e2a6f07..8b5876d 100644
--- a/debian/libkcddb4.symbols
+++ b/debian/libkcddb4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.10.90 amd64 i386
+# SymbolsHelper-Confirmed: 4:15.04.1 amd64
 libkcddb.so.4 libkcddb4 #MINVER#
  _ZN10ConfigBase10setReplyToERK7QString at Base 4:4.3.4
  _ZN10ConfigBase11setHostnameERK7QString at Base 4:4.3.4
@@ -22,8 +22,8 @@ libkcddb.so.4 libkcddb4 #MINVER#
  _ZN10ConfigBaseD0Ev at Base 4:4.3.4
  _ZN10ConfigBaseD1Ev at Base 4:4.3.4
  _ZN10ConfigBaseD2Ev at Base 4:4.3.4
- _ZN19KCoreConfigSkeleton8ItemEnum7Choice2D1Ev at Base 4:4.8.90
- _ZN19KCoreConfigSkeleton8ItemEnum7Choice2D2Ev at Base 4:4.8.90
+ (optional=gccinternal)_ZN19KCoreConfigSkeleton8ItemEnum7Choice2D1Ev at Base 4:4.8.90
+ (optional=gccinternal)_ZN19KCoreConfigSkeleton8ItemEnum7Choice2D2Ev at Base 4:4.8.90
  _ZN5KCDDB12CDInfoDialog10framesTimeEj at Base 4:4.3.4
  _ZN5KCDDB12CDInfoDialog11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.3.4
  _ZN5KCDDB12CDInfoDialog11qt_metacastEPKc at Base 4:4.3.4
@@ -87,9 +87,9 @@ libkcddb.so.4 libkcddb4 #MINVER#
  _ZN5KCDDB6Config7reparseEv at Base 4:4.3.4
  _ZN5KCDDB6ConfigC1Ev at Base 4:4.3.4
  _ZN5KCDDB6ConfigC2Ev at Base 4:4.3.4
- _ZN5KCDDB6ConfigD0Ev at Base 4:4.6.5
- _ZN5KCDDB6ConfigD1Ev at Base 4:4.6.5
- _ZN5KCDDB6ConfigD2Ev at Base 4:4.6.5
+ (optional=gccinternal)_ZN5KCDDB6ConfigD0Ev at Base 4:4.6.5
+ (optional=gccinternal)_ZN5KCDDB6ConfigD1Ev at Base 4:4.6.5
+ (optional=gccinternal)_ZN5KCDDB6ConfigD2Ev at Base 4:4.6.5
  _ZN5KCDDB6GenresC1ERKS0_ at Base 4:4.3.4
  _ZN5KCDDB6GenresC1Ev at Base 4:4.3.4
  _ZN5KCDDB6GenresC2ERKS0_ at Base 4:4.3.4
@@ -150,10 +150,13 @@ libkcddb.so.4 libkcddb4 #MINVER#
  _ZNK5KCDDB9TrackInfoneERKS0_ at Base 4:4.3.4
  (optional=templinst)_ZNSt4pairIKSsSsED1Ev at Base 4:4.8.90
  (optional=templinst)_ZNSt4pairIKSsSsED2Ev at Base 4:4.8.90
- (optional=templinst|arch=amd64)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE10_M_insert_EPSt18_Rb_tree_node_baseSA_RKS2_ at Base 4:4.10.90
- (optional=templinst|arch=i386)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS2_ERKS2_ at Base 4:4.10.90
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_ at Base 4:15.04.1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 4:15.04.1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 4:15.04.1
+ (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE10_M_insert_EPSt18_Rb_tree_node_baseSA_RKS2_ at Base 4:4.10.90
+ (optional=templinst|arch=alpha armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS2_ERKS2_ at Base 4:4.10.90
  (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE24_M_get_insert_unique_posERS1_ at Base 4:4.10.3
- (optional=templinst|arch=amd64)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERS1_ at Base 4:4.10.90
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 ppc64el x32)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERS1_ at Base 4:4.10.90
  (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 4:4.8.90
  _ZTI10ConfigBase at Base 4:4.3.4
  _ZTIN5KCDDB12CDInfoDialogE at Base 4:4.3.4
diff --git a/debian/patches/libmusicbrainz5cc.patch b/debian/patches/libmusicbrainz5cc.patch
new file mode 100644
index 0000000..8528078
--- /dev/null
+++ b/debian/patches/libmusicbrainz5cc.patch
@@ -0,0 +1,16 @@
+Description: Prefer libmusicbrainz5cc to libmusicbrainz5
+Author: Maximiliano Curia <maxy at debian.org>
+Last-Update: 2015-07-09
+Index: libkcddb/cmake/FindMusicBrainz5.cmake
+===================================================================
+--- libkcddb.orig/cmake/FindMusicBrainz5.cmake	2015-07-08 10:05:09.935835266 +0200
++++ libkcddb/cmake/FindMusicBrainz5.cmake	2015-07-09 13:36:16.002251552 +0200
+@@ -16,7 +16,7 @@
+ 
+ FIND_PATH(MUSICBRAINZ5_INCLUDE_DIR musicbrainz5/Disc.h)
+ 
+-FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5)
++FIND_LIBRARY( MUSICBRAINZ5_LIBRARIES NAMES musicbrainz5cc musicbrainz5)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args( MusicBrainz5 DEFAULT_MSG
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d8b1f44
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libmusicbrainz5cc.patch

-- 
libkcddb packaging

More information about the pkg-kde-commits mailing list