[Merge] lp:~thomas-voss/dbus-cpp/bump-so-name-and-major-version into lp:dbus-cpp

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt	2014-05-05 08:38:36 +0000
> +++ CMakeLists.txt	2014-06-16 12:57:36 +0000
> @@ -51,7 +51,7 @@
>    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
>  ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
>  
> -set(DBUS_CPP_VERSION_MAJOR 3)
> +set(DBUS_CPP_VERSION_MAJOR 4)
>  set(DBUS_CPP_VERSION_MINOR 0)
>  set(DBUS_CPP_VERSION_PATCH 0)
>  
> 
> === modified file 'debian/control'
> --- debian/control	2014-05-05 08:38:36 +0000
> +++ debian/control	2014-06-16 12:57:36 +0000
> @@ -5,6 +5,7 @@
>                 dbus,
>                 debhelper (>= 9),
>                 doxygen,
> +               g++ (>= 4:4.9.0-3ubuntu6),

Since the ABI is still experimental and may change again in the future, this should be a build-dep on a specific compiler.

debian/control: Build-Depends: g++-4.9
debian/rules: export CXX=g++-4.9

N.B. this does not give upstreams carte blanche to hold back their toolchain versions for a cycle; it only gives them control over the ABI bumps within the cycle.

>                 google-mock,
>                 libboost-filesystem-dev,
>                 libboost-system-dev,
> @@ -22,7 +23,7 @@
>  Vcs-Bzr: https://code.launchpad.net/~phablet-team/dbus-cpp/trunk
>  Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/dbus-cpp/trunk/files
>  
> -Package: libdbus-cpp3
> +Package: libdbus-cpp4
>  Section: libdevel
>  Architecture: any
>  Multi-Arch: same
> @@ -39,7 +40,7 @@
>  Multi-Arch: foreign
>  Depends: ${misc:Depends},
>           ${shlibs:Depends},
> -         libdbus-cpp3 (= ${binary:Version})
> +         libdbus-cpp4 (= ${binary:Version})
>  Description: header-only dbus-binding leveraging C++-11
>   Protocol compiler and generator to automatically generate protocol headers from
>   introspection XML.
> @@ -51,7 +52,7 @@
>  Depends: ${misc:Depends},
>           ${shlibs:Depends},
>           dbus,
> -         libdbus-cpp3 (= ${binary:Version})
> +         libdbus-cpp4 (= ${binary:Version})
>  Replaces: dbus-cpp-dev
>  Conflicts: dbus-cpp-dev
>  Provides: dbus-cpp-dev
> 
> === renamed file 'debian/libdbus-cpp3.install' => 'debian/libdbus-cpp4.install'
> === renamed file 'debian/libdbus-cpp3.symbols.32bit' => 'debian/libdbus-cpp4.symbols.32bit'
> --- debian/libdbus-cpp3.symbols.32bit	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.32bit	2014-06-16 12:57:36 +0000
> @@ -200,4 +200,4 @@
>   (c++)"vtable for core::dbus::Fixture at Base" 2.0.0+14.04.20140310
>   (c++)"vtable for core::dbus::PendingCall at Base" 2.0.0+14.04.20140310
>   (c++)"vtable for core::dbus::types::ObjectPath::Errors::InvalidObjectPathStringRepresentation at Base" 2.0.0+14.04.20140310
> -#include "libdbus-cpp3.symbols.coverage"
> \ No newline at end of file
> +#include "libdbus-cpp4.symbols.coverage"
> \ No newline at end of file
> 
> === renamed file 'debian/libdbus-cpp3.symbols.64bit' => 'debian/libdbus-cpp4.symbols.64bit'
> --- debian/libdbus-cpp3.symbols.64bit	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.64bit	2014-06-16 12:57:36 +0000
> @@ -200,4 +200,4 @@
>   (c++)"vtable for core::dbus::Fixture at Base" 2.0.0+14.04.20140310
>   (c++)"vtable for core::dbus::PendingCall at Base" 2.0.0+14.04.20140310
>   (c++)"vtable for core::dbus::types::ObjectPath::Errors::InvalidObjectPathStringRepresentation at Base" 2.0.0+14.04.20140310
> -#include "libdbus-cpp3.symbols.coverage"
> \ No newline at end of file
> +#include "libdbus-cpp4.symbols.coverage"
> \ No newline at end of file
> 
> === renamed file 'debian/libdbus-cpp3.symbols.amd64' => 'debian/libdbus-cpp4.symbols.amd64'
> --- debian/libdbus-cpp3.symbols.amd64	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.amd64	2014-06-16 12:57:36 +0000
> @@ -1,2 +1,2 @@
> -libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
> -#include "libdbus-cpp3.symbols.64bit"
> +libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
> +#include "libdbus-cpp4.symbols.64bit"
> 
> === renamed file 'debian/libdbus-cpp3.symbols.arm64' => 'debian/libdbus-cpp4.symbols.arm64'
> --- debian/libdbus-cpp3.symbols.arm64	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.arm64	2014-06-16 12:57:36 +0000
> @@ -1,2 +1,2 @@
> -libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
> -#include "libdbus-cpp3.symbols.64bit"
> +libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
> +#include "libdbus-cpp4.symbols.64bit"
> 
> === renamed file 'debian/libdbus-cpp3.symbols.armhf' => 'debian/libdbus-cpp4.symbols.armhf'
> --- debian/libdbus-cpp3.symbols.armhf	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.armhf	2014-06-16 12:57:36 +0000
> @@ -1,2 +1,2 @@
> -libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
> -#include "libdbus-cpp3.symbols.32bit"
> +libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
> +#include "libdbus-cpp4.symbols.32bit"
> 
> === renamed file 'debian/libdbus-cpp3.symbols.coverage' => 'debian/libdbus-cpp4.symbols.coverage'
> === renamed file 'debian/libdbus-cpp3.symbols.i386' => 'debian/libdbus-cpp4.symbols.i386'
> --- debian/libdbus-cpp3.symbols.i386	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.i386	2014-06-16 12:57:36 +0000
> @@ -1,2 +1,2 @@
> -libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
> -#include "libdbus-cpp3.symbols.32bit"
> +libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
> +#include "libdbus-cpp4.symbols.32bit"
> 
> === renamed file 'debian/libdbus-cpp3.symbols.powerpc' => 'debian/libdbus-cpp4.symbols.powerpc'
> --- debian/libdbus-cpp3.symbols.powerpc	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.powerpc	2014-06-16 12:57:36 +0000
> @@ -1,2 +1,2 @@
> -libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
> -#include "libdbus-cpp3.symbols.32bit"
> +libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
> +#include "libdbus-cpp4.symbols.32bit"
> 
> === renamed file 'debian/libdbus-cpp3.symbols.ppc64el' => 'debian/libdbus-cpp4.symbols.ppc64el'
> --- debian/libdbus-cpp3.symbols.ppc64el	2014-05-05 08:38:36 +0000
> +++ debian/libdbus-cpp4.symbols.ppc64el	2014-06-16 12:57:36 +0000
> @@ -1,2 +1,2 @@
> -libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
> -#include "libdbus-cpp3.symbols.64bit"
> +libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
> +#include "libdbus-cpp4.symbols.64bit"
> 


-- 
https://code.launchpad.net/~thomas-voss/dbus-cpp/bump-so-name-and-major-version/+merge/223224
Your team Ubuntu Phablet Team is subscribed to branch lp:dbus-cpp.