[SCM] libmusicbrainz/master: Prepare for g++ 5 transition

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 497ac3ef7db8b0ad65a07546178db16bdf34f6f6
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jul 11 17:17:10 2015 +0200

    Prepare for g++ 5 transition

diff --git a/debian/control b/debian/control
index 234957a..a207bad 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,13 @@ Build-Depends:
  debhelper (>= 9.20120417),
  cmake,
  libneon27-gnutls-dev | libneon-dev,
- libxml2-dev
+ libxml2-dev,
+ g++ (>= 4:5),
 Build-Depends-Indep:
  doxygen,
  graphviz
+Build-Conflicts:
+ g++-5 (<< 5.1.1-20~)
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://musicbrainz.org/doc/libmusicbrainz
@@ -59,7 +62,7 @@ Description: Library to access the MusicBrainz.org database (C wrapper functions
  .
  This package contains the shared library for the C wrapper functions.
 
-Package: libmusicbrainz5cc2
+Package: libmusicbrainz5cc2v5
 Architecture: any
 Pre-Depends:
  ${misc:Pre-Depends},
diff --git a/debian/libmusicbrainz5cc2.shlibs b/debian/libmusicbrainz5cc2.shlibs
deleted file mode 100644
index 6645910..0000000
--- a/debian/libmusicbrainz5cc2.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libmusicbrainz5cc 2 libmusicbrainz5cc2 (>= 5.1)
diff --git a/debian/libmusicbrainz5cc2.install b/debian/libmusicbrainz5cc2v5.install
similarity index 100%
rename from debian/libmusicbrainz5cc2.install
rename to debian/libmusicbrainz5cc2v5.install
diff --git a/debian/libmusicbrainz5cc2v5.shlibs b/debian/libmusicbrainz5cc2v5.shlibs
new file mode 100644
index 0000000..ccf981a
--- /dev/null
+++ b/debian/libmusicbrainz5cc2v5.shlibs
@@ -0,0 +1 @@
+libmusicbrainz5cc 2v5 libmusicbrainz5cc2v5 (>= 5.1)
diff --git a/debian/patches/gcc-5.patch b/debian/patches/gcc-5.patch
new file mode 100644
index 0000000..50800a1
--- /dev/null
+++ b/debian/patches/gcc-5.patch
@@ -0,0 +1,18 @@
+Description: Bump SONAME for g++ 5 transition
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-07-11
+
+--- libmusicbrainz5-5.1.0+git20150707.orig/CMakeLists.txt
++++ libmusicbrainz5-5.1.0+git20150707/CMakeLists.txt
+@@ -15,8 +15,8 @@ MATH(EXPR musicbrainz5_SOVERSION_MAJOR "
+ MATH(EXPR musicbrainz5_SOVERSION_MINOR "${musicbrainz5_SOVERSION_AGE}")
+ MATH(EXPR musicbrainz5_SOVERSION_PATCH "${musicbrainz5_SOVERSION_REVISION}")
+ 
+-SET(musicbrainz5_VERSION ${musicbrainz5_SOVERSION_MAJOR}.${musicbrainz5_SOVERSION_MINOR}.${musicbrainz5_SOVERSION_PATCH})
+-SET(musicbrainz5_SOVERSION ${musicbrainz5_SOVERSION_MAJOR})
++SET(musicbrainz5_VERSION ${musicbrainz5_SOVERSION_MAJOR}v5.${musicbrainz5_SOVERSION_MINOR}.${musicbrainz5_SOVERSION_PATCH})
++SET(musicbrainz5_SOVERSION ${musicbrainz5_SOVERSION_MAJOR}v5)
+ 
+ SET(musicbrainz5c_SOVERSION_CURRENT  2)
+ SET(musicbrainz5c_SOVERSION_REVISION 0)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1ad11fc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc-5.patch

-- 
Library to access the MusicBrainz.org database