[SCM] libcoverart/master: Bump SONAME for g++ 5 transition

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jul 8 18:06:35 UTC 2015


The following commit has been merged in the master branch:
commit 71ded7068bb4cddd5e7a37324e984e1d915f559a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jul 8 20:05:09 2015 +0200

    Bump SONAME for g++ 5 transition
    
    Closes: #791110

diff --git a/debian/control b/debian/control
index 542a9a8..5f2ba09 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends:
  debhelper (>= 9),
  cmake,
  libneon27-gnutls-dev | libneon-dev,
- libjansson-dev
+ libjansson-dev,
+ g++ (>= 4:5)
 Build-Depends-Indep:
  doxygen,
  graphviz
@@ -22,7 +23,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  libcoverart1 (= ${binary:Version}),
- libcoverartcc1 (= ${binary:Version}),
+ libcoverartcc1v5 (= ${binary:Version}),
  libneon27-gnutls-dev | libneon-dev,
  libjansson-dev
 Suggests:
@@ -52,7 +53,7 @@ Description: library to access the Cover Art Archive (C wrapper functions)
  .
  This package contains the shared library for the C wrapper functions.
 
-Package: libcoverartcc1
+Package: libcoverartcc1v5
 Architecture: any
 Pre-Depends:
  ${misc:Pre-Depends},
@@ -76,7 +77,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  libcoverart1 (= ${binary:Version}),
- libcoverartcc1 (= ${binary:Version})
+ libcoverartcc1v5 (= ${binary:Version})
 Multi-Arch: same
 Description: library to access the Cover Art Archive (debugging symbols)
  The Cover Art Archive (CAA) is a joint project between MusicBrainz and
diff --git a/debian/libcoverartcc1.shlibs b/debian/libcoverartcc1.shlibs
deleted file mode 100644
index 238c338..0000000
--- a/debian/libcoverartcc1.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libcoverartcc 1 libcoverartcc1 (>= 1.0)
diff --git a/debian/libcoverartcc1.install b/debian/libcoverartcc1v5.install
similarity index 100%
rename from debian/libcoverartcc1.install
rename to debian/libcoverartcc1v5.install
diff --git a/debian/libcoverartcc1v5.shlibs b/debian/libcoverartcc1v5.shlibs
new file mode 100644
index 0000000..423af58
--- /dev/null
+++ b/debian/libcoverartcc1v5.shlibs
@@ -0,0 +1 @@
+libcoverartcc 1v5 libcoverartcc1v5 (>= 1.0)
diff --git a/debian/patches/gcc-5.patch b/debian/patches/gcc-5.patch
new file mode 100644
index 0000000..1a4389a
--- /dev/null
+++ b/debian/patches/gcc-5.patch
@@ -0,0 +1,18 @@
+Description: Bump SONAME for g++ 5
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-07-08
+
+--- libcoverart-1.0.0+git20150706.orig/CMakeLists.txt
++++ libcoverart-1.0.0+git20150706/CMakeLists.txt
+@@ -15,8 +15,8 @@ MATH(EXPR coverart_SOVERSION_MAJOR "${co
+ MATH(EXPR coverart_SOVERSION_MINOR "${coverart_SOVERSION_AGE}")
+ MATH(EXPR coverart_SOVERSION_PATCH "${coverart_SOVERSION_REVISION}")
+ 
+-SET(coverart_VERSION ${coverart_SOVERSION_MAJOR}.${coverart_SOVERSION_MINOR}.${coverart_SOVERSION_PATCH})
+-SET(coverart_SOVERSION ${coverart_SOVERSION_MAJOR})
++SET(coverart_VERSION ${coverart_SOVERSION_MAJOR}v5.${coverart_SOVERSION_MINOR}.${coverart_SOVERSION_PATCH})
++SET(coverart_SOVERSION ${coverart_SOVERSION_MAJOR}v5)
+ 
+ SET(coverartc_SOVERSION_CURRENT  1)
+ SET(coverartc_SOVERSION_REVISION 0)
diff --git a/debian/patches/series b/debian/patches/series
index 002c7df..3712c37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-unused-code.patch
 out-of-tree.patch
+gcc-5.patch

-- 
libcoverart packaging



More information about the pkg-multimedia-commits mailing list