Control: tags -1 + patch

  * Rename libprotobuf-lite9 to libprotobuf-lite9v5, triggered by the libstdc++6
    ABI change. Closes: #791246.
  * Rename libprotobuf9 to libprotobuf9v5.
  * Rename libprotoc9 to libprotoc9v5.
  * Add Conflicts/Replaces for the old libraries.

 
diff -Nru protobuf-2.6.1/debian/control protobuf-2.6.1/debian/control
--- protobuf-2.6.1/debian/control       2015-07-15 17:56:13.000000000 +0200
+++ protobuf-2.6.1/debian/control       2015-07-29 17:24:48.000000000 +0200
@@ -33,11 +33,13 @@
 Vcs-Git: git://anonscm.debian.org/collab-maint/protobuf.git
 X-Python-Version: >= 2.7
 
-Package: libprotobuf9
+Package: libprotobuf9v5
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libprotobuf9
+Replaces: libprotobuf9
 Description: protocol buffers C++ library
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -52,11 +54,13 @@
  .
  This package contains the runtime library needed for C++ applications.
 
-Package: libprotobuf-lite9
+Package: libprotobuf-lite9v5
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libprotobuf-lite9
+Replaces: libprotobuf-lite9
 Description: protocol buffers C++ library (lite version)
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -77,7 +81,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, zlib1g-dev,
- libprotobuf9 (= ${binary:Version}), libprotobuf-lite9 (= ${binary:Version})
+ libprotobuf9v5 (= ${binary:Version}), libprotobuf-lite9v5 (= 
${binary:Version})
 Description: protocol buffers C++ library (development files)
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -93,11 +97,13 @@
  This package contains the development headers and static libraries needed for
  writing C++ applications.
 
-Package: libprotoc9
+Package: libprotoc9v5
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libprotoc9
+Replaces: libprotoc9
 Description: protocol buffers compiler library
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
@@ -118,7 +124,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
- libprotoc9 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
+ libprotoc9v5 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
 Replaces: libprotobuf-dev (<< 2.1.0)
 Breaks: libprotobuf-dev (<< 2.1.0)
 Description: protocol buffers compiler library (development files)
@@ -139,7 +145,7 @@
 Package: protobuf-compiler
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc9 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc9v5 (= ${binary:Version})
 Description: compiler for protocol buffer definition files
  Protocol buffers are a flexible, efficient, automated mechanism for
  serializing structured data - similar to XML, but smaller, faster, and
diff -Nru protobuf-2.6.1/debian/libprotobuf9.install 
protobuf-2.6.1/debian/libprotobuf9.install
--- protobuf-2.6.1/debian/libprotobuf9.install  2014-10-24 19:55:59.000000000 
+0200
+++ protobuf-2.6.1/debian/libprotobuf9.install  1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-usr/lib/*/libprotobuf.so.*
diff -Nru protobuf-2.6.1/debian/libprotobuf9.shlibs 
protobuf-2.6.1/debian/libprotobuf9.shlibs
--- protobuf-2.6.1/debian/libprotobuf9.shlibs   2014-10-24 19:55:59.000000000 
+0200
+++ protobuf-2.6.1/debian/libprotobuf9.shlibs   1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-libprotobuf 9 libprotobuf9
diff -Nru protobuf-2.6.1/debian/libprotobuf9v5.install 
protobuf-2.6.1/debian/libprotobuf9v5.install
--- protobuf-2.6.1/debian/libprotobuf9v5.install        1970-01-01 
01:00:00.000000000 +0100
+++ protobuf-2.6.1/debian/libprotobuf9v5.install        2014-10-24 
19:55:59.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/*/libprotobuf.so.*
diff -Nru protobuf-2.6.1/debian/libprotobuf9v5.shlibs 
protobuf-2.6.1/debian/libprotobuf9v5.shlibs
--- protobuf-2.6.1/debian/libprotobuf9v5.shlibs 1970-01-01 01:00:00.000000000 
+0100
+++ protobuf-2.6.1/debian/libprotobuf9v5.shlibs 2015-07-29 17:25:49.000000000 
+0200
@@ -0,0 +1 @@
+libprotobuf 9 libprotobuf9v5
diff -Nru protobuf-2.6.1/debian/libprotobuf-lite9.install 
protobuf-2.6.1/debian/libprotobuf-lite9.install
--- protobuf-2.6.1/debian/libprotobuf-lite9.install     2014-10-24 
19:55:59.000000000 +0200
+++ protobuf-2.6.1/debian/libprotobuf-lite9.install     1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/libprotobuf-lite.so.*
diff -Nru protobuf-2.6.1/debian/libprotobuf-lite9.shlibs 
protobuf-2.6.1/debian/libprotobuf-lite9.shlibs
--- protobuf-2.6.1/debian/libprotobuf-lite9.shlibs      2014-10-24 
19:55:59.000000000 +0200
+++ protobuf-2.6.1/debian/libprotobuf-lite9.shlibs      1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libprotobuf-lite 9 libprotobuf-lite9
diff -Nru protobuf-2.6.1/debian/libprotobuf-lite9v5.install 
protobuf-2.6.1/debian/libprotobuf-lite9v5.install
--- protobuf-2.6.1/debian/libprotobuf-lite9v5.install   1970-01-01 
01:00:00.000000000 +0100
+++ protobuf-2.6.1/debian/libprotobuf-lite9v5.install   2014-10-24 
19:55:59.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/*/libprotobuf-lite.so.*
diff -Nru protobuf-2.6.1/debian/libprotobuf-lite9v5.shlibs 
protobuf-2.6.1/debian/libprotobuf-lite9v5.shlibs
--- protobuf-2.6.1/debian/libprotobuf-lite9v5.shlibs    1970-01-01 
01:00:00.000000000 +0100
+++ protobuf-2.6.1/debian/libprotobuf-lite9v5.shlibs    2015-07-29 
17:25:44.000000000 +0200
@@ -0,0 +1 @@
+libprotobuf-lite 9 libprotobuf-lite9v5
diff -Nru protobuf-2.6.1/debian/libprotoc9.install 
protobuf-2.6.1/debian/libprotoc9.install
--- protobuf-2.6.1/debian/libprotoc9.install    2014-10-24 19:55:59.000000000 
+0200
+++ protobuf-2.6.1/debian/libprotoc9.install    1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-usr/lib/*/libprotoc*.so.*
diff -Nru protobuf-2.6.1/debian/libprotoc9.shlibs 
protobuf-2.6.1/debian/libprotoc9.shlibs
--- protobuf-2.6.1/debian/libprotoc9.shlibs     2014-10-24 19:55:59.000000000 
+0200
+++ protobuf-2.6.1/debian/libprotoc9.shlibs     1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-libprotoc 9 libprotoc9
diff -Nru protobuf-2.6.1/debian/libprotoc9v5.install 
protobuf-2.6.1/debian/libprotoc9v5.install
--- protobuf-2.6.1/debian/libprotoc9v5.install  1970-01-01 01:00:00.000000000 
+0100
+++ protobuf-2.6.1/debian/libprotoc9v5.install  2014-10-24 19:55:59.000000000 
+0200
@@ -0,0 +1 @@
+usr/lib/*/libprotoc*.so.*
diff -Nru protobuf-2.6.1/debian/libprotoc9v5.shlibs 
protobuf-2.6.1/debian/libprotoc9v5.shlibs
--- protobuf-2.6.1/debian/libprotoc9v5.shlibs   1970-01-01 01:00:00.000000000 
+0100
+++ protobuf-2.6.1/debian/libprotoc9v5.shlibs   2015-07-29 17:25:52.000000000 
+0200
@@ -0,0 +1 @@
+libprotoc 9 libprotoc9v5
diff -Nru protobuf-2.6.1/debian/rules protobuf-2.6.1/debian/rules
--- protobuf-2.6.1/debian/rules 2014-10-24 19:55:59.000000000 +0200
+++ protobuf-2.6.1/debian/rules 2015-07-29 17:26:56.000000000 +0200
@@ -73,9 +73,9 @@
 
        # Convert doc dir to symlink for the -dev packages.
        rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
-       ln -s libprotobuf9 
$(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
+       ln -s libprotobuf9v5 
$(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
        rm -rf $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
-       ln -s libprotoc9 
$(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
+       ln -s libprotoc9v5 
$(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
 
        # Remove compiler headers from libprotobuf-dev.
        rm -rf 
$(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler

Reply via email to