[SCM] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf

Bas Couwenberg sebastic at xs4all.nl
Tue Sep 17 22:46:18 UTC 2013


The following commit has been merged in the master branch:
commit c43917bb11a0e1923b82339ceb540e54b390021d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 23:57:10 2013 +0200

    SONAME of libmapcache changed from libmapcache.so.0 to libmapcache.so.1.

diff --git a/debian/changelog b/debian/changelog
index 6792c31..9181d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
   * Use pkgkde-gensymbols & pkgkde-symbolshelper to handle symbols.
   * Add patch to use a versioned SONAME.
   * SONAME of libmapcache changed from libmapcache.so.0 to
-    libmapcache.so.
+    libmapcache.so.1.
   * Update libmapcache symbols for 1.2.0 on amd64.
   * Enable verbose make output.
   * Call ldconfig in libmapcache postinst and postrm.
diff --git a/debian/control b/debian/control
index a80c218..67d8514 100644
--- a/debian/control
+++ b/debian/control
@@ -20,18 +20,18 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
 
 Package: libmapcache0
-Depends: libmapcache, ${misc:Depends}
+Depends: libmapcache1, ${misc:Depends}
 Architecture: any
 Section: oldlibs
-Description: Dummy package for libmapcache0 to libmapcache transition
+Description: Dummy package for libmapcache0 to libmapcache1 transition
  This is a transitional dummy package to ease upgrades from the
- libmapcache0 package to the libmapcache package.
+ libmapcache0 package to the libmapcache1 package.
  It can safely be removed.
 
-Package: libmapcache
-Provides: libmapcache0
-Replaces: libmapcache0
-Breaks: libmapcache0 (<= 1.1)
+Package: libmapcache1
+Provides: libmapcache, libmapcache0
+Replaces: libmapcache, libmapcache0
+Breaks: libmapcache (<= 1.2.0), libmapcache0 (<= 1.2.0)
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -45,21 +45,21 @@ Description: tile caching server - shared library
  solution.
 
 Package: libmapcache0-dev
-Depends: libmapcache-dev, ${misc:Depends}
+Depends: libmapcache1-dev, ${misc:Depends}
 Architecture: any
 Section: oldlibs
-Description: Transitional dummy package for libmapcache-dev
+Description: Transitional dummy package for libmapcache1-dev
  This is a transitional dummy package to ease upgrades from the
- libmapcache0-dev package to the libmapcache-dev package.
+ libmapcache0-dev package to the libmapcache1-dev package.
  It can safely be removed.
 
-Package: libmapcache-dev
-Provides: libmapcache0-dev
-Replaces: libmapcache0-dev
-Breaks: libmapcache0-dev (<= 1.1)
+Package: libmapcache1-dev
+Provides: libmapcache-dev, libmapcache0-dev
+Replaces: libmapcache-dev, libmapcache0-dev
+Breaks: libmapcache-dev (<= 1.2.0), libmapcache0-dev (<= 1.2.0)
 Section: libdevel
 Architecture: any
-Depends: libmapcache (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libmapcache1 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: mapcache-cgi, mapcache-tools, libapache2-mod-mapcache
 Description: tile caching server - shared library development files
  This package contains the development files for the shared library.
diff --git a/debian/libmapcache-dev.install b/debian/libmapcache-dev.install
deleted file mode 100644
index 0c77627..0000000
--- a/debian/libmapcache-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/mapcache/*
diff --git a/debian/libmapcache.install b/debian/libmapcache.install
deleted file mode 100644
index 3af14b7..0000000
--- a/debian/libmapcache.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmapcache.so*
diff --git a/debian/libmapcache1-dev.install b/debian/libmapcache1-dev.install
new file mode 100644
index 0000000..f6a7487
--- /dev/null
+++ b/debian/libmapcache1-dev.install
@@ -0,0 +1,2 @@
+usr/include/mapcache/*
+usr/lib/*/libmapcache.so
diff --git a/debian/libmapcache1.install b/debian/libmapcache1.install
new file mode 100644
index 0000000..69df65a
--- /dev/null
+++ b/debian/libmapcache1.install
@@ -0,0 +1 @@
+usr/lib/*/libmapcache.so.*
diff --git a/debian/libmapcache.postinst b/debian/libmapcache1.postinst
similarity index 100%
rename from debian/libmapcache.postinst
rename to debian/libmapcache1.postinst
diff --git a/debian/libmapcache.postrm b/debian/libmapcache1.postrm
similarity index 100%
rename from debian/libmapcache.postrm
rename to debian/libmapcache1.postrm
diff --git a/debian/libmapcache.symbols b/debian/libmapcache1.symbols
similarity index 99%
rename from debian/libmapcache.symbols
rename to debian/libmapcache1.symbols
index c630752..57327cd 100644
--- a/debian/libmapcache.symbols
+++ b/debian/libmapcache1.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 1.2.0 amd64
-libmapcache.so #PACKAGE# #MINVER#
+libmapcache.so.1 #PACKAGE# #MINVER#
  EZXML_NIL at Base 1.0.0
  _configuration_parse_wms_xml at Base 1.0.0
  _create_capabilities_demo at Base 1.0.0

-- 
Packaging for MapCache



More information about the Pkg-grass-devel mailing list