[skstream] 01/01: Rename library packages for g++-5 ABI transition.

Simon McVittie smcv at debian.org
Tue Aug 18 23:09:19 UTC 2015


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

smcv pushed a commit to branch master
in repository skstream.

commit 98a3568b3ace2ac8dbc49b36534be087c1678065
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Aug 18 23:39:54 2015 +0100

    Rename library packages for g++-5 ABI transition.
    
    Patch by Steve Langasek, taken from Ubuntu. (Closes: #791284)
    
    Build-depend on the transitioned cppunit so everything happens in
    the right order.
---
 debian/changelog                                   | 10 ++++++
 debian/control                                     | 14 +++++---
 ...m-0.3-7.install => libskstream-0.3-7v5.install} |  0
 ...m-0.3-7.symbols => libskstream-0.3-7v5.symbols} | 41 +++++++++++-----------
 debian/rules                                       |  2 +-
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d45b402..29dda23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+skstream (0.3.9-2) unstable; urgency=medium
+
+  * Team upload
+  * Rename library packages for g++-5 ABI transition.
+    Patch by Steve Langasek, taken from Ubuntu. (Closes: #791284)
+  * Build-depend on the transitioned cppunit so everything happens in
+    the right order.
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 18 Aug 2015 23:38:45 +0100
+
 skstream (0.3.9-1) unstable; urgency=low
 
   * new upstream release
diff --git a/debian/control b/debian/control
index 42bc473..a170a05 100644
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,20 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen M. Webb <stephen.webb at bregmasoft.ca>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               libcppunit-dev
+               libcppunit-dev (>= 1.13.2-2.1),
 Standards-Version: 3.9.4
 Homepage: http://www.worldforge.org/
 Vcs-Git: git://anonscm.debian.org/pkg-games/skstream.git
 Vcs-Browser: http://anonscm.debian.org/git/pkg-games/skstream.git
 
-Package: libskstream-0.3-7
+Package: libskstream-0.3-7v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: libskstream-0.3-7
+Replaces: libskstream-0.3-7
 Description: iostream-based C++ socket library
  Skstream is a library that makes TCP and UDP sockets available as C++
  iostream-based objects. It is used as the underlying transport layer in
@@ -29,7 +31,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libskstream-0.3-7 (= ${binary:Version}),
+Depends: libskstream-0.3-7v5 (= ${binary:Version}),
          ${misc:Depends}
 Description: iostream-based C++ socket library - development files
  Skstream is a library that makes TCP and UDP sockets available as C++
@@ -39,14 +41,16 @@ Description: iostream-based C++ socket library - development files
  This package contains the files used for developing against the skstream
  library.
 
-Package: libskstream-0.3-7-dbg
+Package: libskstream-0.3-7v5-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libskstream-0.3-7 (= ${binary:Version}),
+Depends: libskstream-0.3-7v5 (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: libskstream-0.3-7-dbg
+Replaces: libskstream-0.3-7-dbg
 Description: iostream-based C++ socket library - debugging symbols
  Skstream is a library that makes TCP and UDP sockets available as C++
  iostream-based objects. It is used as the underlying transport layer in
diff --git a/debian/libskstream-0.3-7.install b/debian/libskstream-0.3-7v5.install
similarity index 100%
rename from debian/libskstream-0.3-7.install
rename to debian/libskstream-0.3-7v5.install
diff --git a/debian/libskstream-0.3-7.symbols b/debian/libskstream-0.3-7v5.symbols
similarity index 79%
rename from debian/libskstream-0.3-7.symbols
rename to debian/libskstream-0.3-7v5.symbols
index 318c472..b5665da 100644
--- a/debian/libskstream-0.3-7.symbols
+++ b/debian/libskstream-0.3-7v5.symbols
@@ -1,18 +1,18 @@
-libskstream-0.3.so.7 libskstream-0.3-7 #MINVER#
+libskstream-0.3.so.7 libskstream-0.3-7v5 #MINVER#
  (c++)"tcp_address::tcp_address()@Base" 0.3.9
  (c++)"tcp_address::~tcp_address()@Base" 0.3.9
  _ZN12basic_socket13startup_countE at Base 0.3.9
  _ZN12basic_socket7startupEv at Base 0.3.8
  _ZN13basic_address14const_iteratorppEv at Base 0.3.9
- _ZN13basic_address15resolveListenerERKSs at Base 0.3.9
- _ZN13basic_address16resolveConnectorERKSsS1_ at Base 0.3.9
+ (c++)"basic_address::resolveListener(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.3.9
+ (c++)"basic_address::resolveConnector(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.3.9
  _ZN13basic_address7resolveEiPKcS1_ at Base 0.3.9
  (c++)"basic_address::basic_address(int, int)@Base" 0.3.9
  (c++)"basic_address::~basic_address()@Base" 0.3.9
  (c++)"basic_socket::basic_socket()@Base" 0.3.8
  (c++)"basic_socket::~basic_socket()@Base" 0.3.8
  _ZN15dgram_socketbuf8overflowEi at Base 0.3.8
- _ZN15dgram_socketbuf9setTargetERKSsji at Base 0.3.8
+ (c++)"dgram_socketbuf::setTarget(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, int)@Base" 0.3.9
  _ZN15dgram_socketbuf9underflowEv at Base 0.3.8
  (regex|c++)_ZN15dgram_socketbufC1EiPc[il]@Base 0.3.8
  (regex|c++)_ZN15dgram_socketbufC1Ei(ii|ll)@Base 0.3.8
@@ -47,16 +47,16 @@ libskstream-0.3.so.7 libskstream-0.3-7 #MINVER#
  _ZN17tcp_socket_serverD1Ev at Base 0.3.8
  _ZN17tcp_socket_serverD2Ev at Base 0.3.8
  _ZN17tcp_socket_stream4openEP8addrinfob at Base 0.3.9
- _ZN17tcp_socket_stream4openERKSsib at Base 0.3.8
- _ZN17tcp_socket_stream4openERKSsij at Base 0.3.8
+ (c++)"tcp_socket_stream::open(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int, bool)@Base" 0.3.9
+ (c++)"tcp_socket_stream::open(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int, unsigned int)@Base" 0.3.9
  _ZN17tcp_socket_stream7isReadyEj at Base 0.3.8
  _ZN17tcp_socket_stream9open_nextEv at Base 0.3.9
- _ZN17tcp_socket_streamC1ERKSsib at Base 0.3.8
- _ZN17tcp_socket_streamC1ERKSsij at Base 0.3.8
+ (c++)"tcp_socket_stream::tcp_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int, bool)@Base" 0.3.9
+ (c++)"tcp_socket_stream::tcp_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int, unsigned int)@Base" 0.3.9
  _ZN17tcp_socket_streamC1Ei at Base 0.3.8
  _ZN17tcp_socket_streamC1Ev at Base 0.3.8
- _ZN17tcp_socket_streamC2ERKSsib at Base 0.3.8
- _ZN17tcp_socket_streamC2ERKSsij at Base 0.3.8
+ (c++)"tcp_socket_stream::tcp_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int, bool)@Base" 0.3.9
+ (c++)"tcp_socket_stream::tcp_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int, unsigned int)@Base" 0.3.9
  _ZN17tcp_socket_streamC2Ei at Base 0.3.8
  _ZN17tcp_socket_streamC2Ev at Base 0.3.8
  _ZN17tcp_socket_streamD0Ev at Base 0.3.8
@@ -72,23 +72,23 @@ libskstream-0.3.so.7 libskstream-0.3-7 #MINVER#
  _ZN17udp_socket_streamD0Ev at Base 0.3.8
  _ZN17udp_socket_streamD1Ev at Base 0.3.8
  _ZN17udp_socket_streamD2Ev at Base 0.3.8
- _ZN18unix_socket_server4openERKSs at Base 0.3.8
+ (c++)"unix_socket_server::open(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.3.9
  _ZN18unix_socket_server6acceptEv at Base 0.3.8
  _ZN18unix_socket_serverD0Ev at Base 0.3.8
  _ZN18unix_socket_serverD1Ev at Base 0.3.8
  _ZN18unix_socket_serverD2Ev at Base 0.3.8
- _ZN18unix_socket_stream4openERKSsb at Base 0.3.8
- _ZN18unix_socket_stream4openERKSsj at Base 0.3.8
+ (c++)"unix_socket_stream::open(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.3.9
+ (c++)"unix_socket_stream::open(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.3.9
  _ZN18unix_socket_stream4openERS_b at Base 0.3.8
  _ZN18unix_socket_stream7isReadyEj at Base 0.3.8
- _ZN18unix_socket_streamC1ERKSsb at Base 0.3.8
- _ZN18unix_socket_streamC1ERKSsj at Base 0.3.8
+ (c++)"unix_socket_stream::unix_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.3.9
+ (c++)"unix_socket_stream::unix_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.3.9
  _ZN18unix_socket_streamC1ERS_b at Base 0.3.8
  _ZN18unix_socket_streamC1Ei at Base 0.3.9
+ (c++)"unix_socket_stream::unix_socket_stream(unix_socket_stream&, bool)@Base" 0.3.9
  _ZN18unix_socket_streamC1Ev at Base 0.3.8
- _ZN18unix_socket_streamC2ERKSsb at Base 0.3.8
- _ZN18unix_socket_streamC2ERKSsj at Base 0.3.8
- _ZN18unix_socket_streamC2ERS_b at Base 0.3.8
+ (c++)"unix_socket_stream::unix_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.3.9
+ (c++)"unix_socket_stream::unix_socket_stream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.3.9
  _ZN18unix_socket_streamC2Ei at Base 0.3.9
  _ZN18unix_socket_streamC2Ev at Base 0.3.8
  _ZN18unix_socket_streamD0Ev at Base 0.3.8
@@ -134,11 +134,12 @@ libskstream-0.3.so.7 libskstream-0.3-7 #MINVER#
  _ZNK12basic_socket12setLastErrorEv at Base 0.3.8
  _ZNK13basic_address4sizeEv at Base 0.3.9
  _ZNK13basic_address9getSocketEv at Base 0.3.9
- _ZNK17tcp_socket_stream13getRemoteHostEb at Base 0.3.8
- _ZNK17tcp_socket_stream16getRemoteServiceEb at Base 0.3.8
+ (c++)"tcp_socket_stream::getRemoteHost[abi:cxx11](bool) const at Base" 0.3.9
+ (c++)"tcp_socket_stream::getRemoteService[abi:cxx11](bool) const at Base" 0.3.9
  _ZNK19basic_socket_server9getSocketEv at Base 0.3.8
  _ZNK19basic_socket_stream9getSocketEv at Base 0.3.8
  _ZNK20stream_socket_stream9getSocketEv at Base 0.3.9
+ (c++)"std::ctype<char>::do_widen(char) const at Base" 0.3.9
  (optional=LTO)_ZTC17raw_socket_stream0_19basic_socket_stream at Base 0.3.8
  (optional=LTO)_ZTC17raw_socket_stream0_19dgram_socket_stream at Base 0.3.8
  (c++|regex|optional=LTO)"construction vtable for std::basic_[io]{1,2}stream<char, std::char_traits<char> >-in-raw_socket_stream at Base" 0.3.8
diff --git a/debian/rules b/debian/rules
index 131bae8..1cfba91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ override_dh_install:
 	dh_install --fail-missing -X.la -X.a
 
 override_dh_strip:
-	dh_strip --dbg-package=libskstream-0.3-7-dbg
+	dh_strip --dbg-package=libskstream-0.3-7v5-dbg
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

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



More information about the Pkg-games-commits mailing list