[mapserver] 04/07: Bump SOVERSION to 2 to account for removed symbols, change package names to match new SONAME.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository mapserver.

commit eb3fad383127abf9da4b20ccc187de4af4e0ee89
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 10 14:42:53 2015 +0200

    Bump SOVERSION to 2 to account for removed symbols, change package names to match new SONAME.
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  8 ++++----
 ...libmapserver1.install => libmapserver2.install} |  0
 ...bmapserver1.postinst => libmapserver2.postinst} |  0
 .../{libmapserver1.postrm => libmapserver2.postrm} |  0
 ...libmapserver1.symbols => libmapserver2.symbols} |  2 +-
 debian/patches/series                              |  1 +
 debian/patches/soversion.patch                     | 24 ++++++++++++++++++++++
 8 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a311b5c..5077af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mapserver (7.0.0~beta2-1) UNRELEASED; urgency=medium
   * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency.
   * Add patches for typos.
   * Update symbols for amd64.
+  * Bump SOVERSION to 2 to account for removed symbols,
+    change package names to match new SONAME.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 07 Jul 2015 21:38:27 +0200
 
diff --git a/debian/control b/debian/control
index c02802f..012e5de 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git -b experimental
 Homepage: http://www.mapserver.org
 XS-Ruby-Versions: all
 
-Package: libmapserver1
+Package: libmapserver2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -75,11 +75,11 @@ Package: libmapserver-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libmapserver1 (= ${binary:Version}),
+Depends: libmapserver2 (= ${binary:Version}),
          ${misc:Depends}
 Breaks: libmapserver1-dbg (<< 7.0.0~)
 Replaces: libmapserver1-dbg (<< 7.0.0~)
-Description: Debugging symbols for libmapserver1
+Description: Debugging symbols for libmapserver
  MapServer is a CGI-based framework for Internet map services which
  supports Open Geospatial Consortium (OGC) standards. Scripting
  functionality in MapScript is provided by the suggested mapscript
@@ -90,7 +90,7 @@ Description: Debugging symbols for libmapserver1
 Package: libmapserver-dev
 Architecture: any
 Section: libdevel
-Depends: libmapserver1 (= ${binary:Version}),
+Depends: libmapserver2 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: cgi-mapserver,
           mapserver-bin,
diff --git a/debian/libmapserver1.install b/debian/libmapserver2.install
similarity index 100%
rename from debian/libmapserver1.install
rename to debian/libmapserver2.install
diff --git a/debian/libmapserver1.postinst b/debian/libmapserver2.postinst
similarity index 100%
rename from debian/libmapserver1.postinst
rename to debian/libmapserver2.postinst
diff --git a/debian/libmapserver1.postrm b/debian/libmapserver2.postrm
similarity index 100%
rename from debian/libmapserver1.postrm
rename to debian/libmapserver2.postrm
diff --git a/debian/libmapserver1.symbols b/debian/libmapserver2.symbols
similarity index 99%
rename from debian/libmapserver1.symbols
rename to debian/libmapserver2.symbols
index 37635b4..0812c95 100644
--- a/debian/libmapserver1.symbols
+++ b/debian/libmapserver2.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 7.0.0~beta2 amd64
-libmapserver.so.1 #PACKAGE# #MINVER#
+libmapserver.so.2 #PACKAGE# #MINVER#
  BuildExpressionTree at Base 6.2.1
  CleanVSIDir at Base 6.2.1
  CompareEllipseRegion at Base 6.2.1
diff --git a/debian/patches/series b/debian/patches/series
index 8c12472..d8c92ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ java-hardening.patch
 consistent-typo.patch
 unknown-typo.patch
 avoid-including-header-files-inside-an-extern-c-block.patch
+soversion.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
new file mode 100644
index 0000000..c5e8cf4
--- /dev/null
+++ b/debian/patches/soversion.patch
@@ -0,0 +1,24 @@
+Description: Bump SOVERSION to 2, because of removed symbols.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapserver/pull/5118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -277,7 +277,7 @@ if(BUILD_DYNAMIC)
+   add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES} ${v8_SOURCES})
+   set_target_properties( mapserver  PROPERTIES
+     VERSION ${MapServer_VERSION_STRING}
+-    SOVERSION 1
++    SOVERSION 2
+ ) 
+ endif(BUILD_DYNAMIC)
+ 
+@@ -285,7 +285,7 @@ if(BUILD_STATIC)
+   add_library(mapserver_static STATIC ${mapserver_SOURCES} ${agg_SOURCES} ${v8_SOURCES})
+   set_target_properties( mapserver_static PROPERTIES
+     VERSION ${MapServer_VERSION_STRING}
+-    SOVERSION 1
++    SOVERSION 2
+   ) 
+ endif(BUILD_STATIC)
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git