dbus-cpp

Merge lp:~thomas-voss/dbus-cpp/explicit-gcc-version into lp:dbus-cpp

  1. explicit-gcc-version
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 67
Merged at revision: 65
Proposed branch: lp:~thomas-voss/dbus-cpp/explicit-gcc-version
Merge into: lp:dbus-cpp
Diff against target: 175 lines (+34/-21)
12 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
debian/control (+7/-3)
debian/libdbus-cpp4.symbols.32bit (+1/-1)
debian/libdbus-cpp4.symbols.64bit (+2/-1)
debian/libdbus-cpp4.symbols.amd64 (+2/-2)
debian/libdbus-cpp4.symbols.arm64 (+2/-2)
debian/libdbus-cpp4.symbols.armhf (+2/-2)
debian/libdbus-cpp4.symbols.i386 (+2/-2)
debian/libdbus-cpp4.symbols.powerpc (+2/-2)
debian/libdbus-cpp4.symbols.ppc64el (+2/-2)
debian/rules (+5/-3)
To merge this branch: bzr merge lp:~thomas-voss/dbus-cpp/explicit-gcc-version
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Colin Watson Approve
Matthias Klose Pending
Review via email: mp+224756@code.launchpad.net

Commit message

Bump major revision and so name to account for toolchain update.

Description of the change

Bump major revision and so name to account for toolchain update.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/180/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/180/rebuild

review: Approve (continuous-integration)
lp:~thomas-voss/dbus-cpp/explicit-gcc-version updated
66. By Thomas Voß

Bump major revision and so name to account for toolchain update.

Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/181/rebuild

review: Approve (continuous-integration)
lp:~thomas-voss/dbus-cpp/explicit-gcc-version updated
67. By Thomas Voß

[ Thomas Voß ]
* Bumping revision to force build-dependency.
[ Manuel de la Pena ]
* Provide a new make_executor method to allow to pass the io_service.
[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
[ Ubuntu daily release ]
* New rebuild forced
[ Antti Kaijanmäki ]
* Fix read-only property PropertiesChanged updates. (LP: #1339589)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/194/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-05-05 08:38:36 +0000
3+++ CMakeLists.txt 2014-07-18 09:34:33 +0000
4@@ -51,7 +51,7 @@
5 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
6 ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
7
8-set(DBUS_CPP_VERSION_MAJOR 3)
9+set(DBUS_CPP_VERSION_MAJOR 4)
10 set(DBUS_CPP_VERSION_MINOR 0)
11 set(DBUS_CPP_VERSION_PATCH 0)
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-07-16 20:19:01 +0000
16+++ debian/changelog 2014-07-18 09:34:33 +0000
17@@ -1,3 +1,9 @@
18+dbus-cpp (4.0.0) UNRELEASED; urgency=medium
19+
20+ * Bump major revision and so name to account for toolchain update.
21+
22+ -- Thomas Voß <thomas.voss@canonical.com> Fri, 27 Jun 2014 11:28:52 +0200
23+
24 dbus-cpp (3.1.0+14.10.20140716.1-0ubuntu1) utopic; urgency=medium
25
26 [ Thomas Voß ]
27
28=== modified file 'debian/control'
29--- debian/control 2014-05-05 08:38:36 +0000
30+++ debian/control 2014-07-18 09:34:33 +0000
31@@ -1,10 +1,14 @@
32 Source: dbus-cpp
33 Priority: optional
34 Maintainer: Thomas Voß <thomas.voss@ubuntu.com>
35+# We rely on C++11 features, and to prevent from ABI breaks
36+# in libstdc++ causing us issues, we explicitly select a G++
37+# version.
38 Build-Depends: cmake,
39 dbus,
40 debhelper (>= 9),
41 doxygen,
42+ g++-4.9,
43 google-mock,
44 libboost-filesystem-dev,
45 libboost-system-dev,
46@@ -22,7 +26,7 @@
47 Vcs-Bzr: https://code.launchpad.net/~phablet-team/dbus-cpp/trunk
48 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/dbus-cpp/trunk/files
49
50-Package: libdbus-cpp3
51+Package: libdbus-cpp4
52 Section: libdevel
53 Architecture: any
54 Multi-Arch: same
55@@ -39,7 +43,7 @@
56 Multi-Arch: foreign
57 Depends: ${misc:Depends},
58 ${shlibs:Depends},
59- libdbus-cpp3 (= ${binary:Version})
60+ libdbus-cpp4 (= ${binary:Version})
61 Description: header-only dbus-binding leveraging C++-11
62 Protocol compiler and generator to automatically generate protocol headers from
63 introspection XML.
64@@ -51,7 +55,7 @@
65 Depends: ${misc:Depends},
66 ${shlibs:Depends},
67 dbus,
68- libdbus-cpp3 (= ${binary:Version})
69+ libdbus-cpp4 (= ${binary:Version})
70 Replaces: dbus-cpp-dev
71 Conflicts: dbus-cpp-dev
72 Provides: dbus-cpp-dev
73
74=== renamed file 'debian/libdbus-cpp3.install' => 'debian/libdbus-cpp4.install'
75=== renamed file 'debian/libdbus-cpp3.symbols.32bit' => 'debian/libdbus-cpp4.symbols.32bit'
76--- debian/libdbus-cpp3.symbols.32bit 2014-07-11 13:53:01 +0000
77+++ debian/libdbus-cpp4.symbols.32bit 2014-07-18 09:34:33 +0000
78@@ -201,4 +201,4 @@
79 (c++)"vtable for core::dbus::Fixture@Base" 2.0.0+14.04.20140310
80 (c++)"vtable for core::dbus::PendingCall@Base" 2.0.0+14.04.20140310
81 (c++)"vtable for core::dbus::types::ObjectPath::Errors::InvalidObjectPathStringRepresentation@Base" 2.0.0+14.04.20140310
82-#include "libdbus-cpp3.symbols.coverage"
83+#include "libdbus-cpp4.symbols.coverage"
84
85=== renamed file 'debian/libdbus-cpp3.symbols.64bit' => 'debian/libdbus-cpp4.symbols.64bit'
86--- debian/libdbus-cpp3.symbols.64bit 2014-07-11 13:53:01 +0000
87+++ debian/libdbus-cpp4.symbols.64bit 2014-07-18 09:34:33 +0000
88@@ -201,4 +201,5 @@
89 (c++)"vtable for core::dbus::Fixture@Base" 2.0.0+14.04.20140310
90 (c++)"vtable for core::dbus::PendingCall@Base" 2.0.0+14.04.20140310
91 (c++)"vtable for core::dbus::types::ObjectPath::Errors::InvalidObjectPathStringRepresentation@Base" 2.0.0+14.04.20140310
92-#include "libdbus-cpp3.symbols.coverage"
93+#include "libdbus-cpp4.symbols.coverage"
94+
95
96=== renamed file 'debian/libdbus-cpp3.symbols.amd64' => 'debian/libdbus-cpp4.symbols.amd64'
97--- debian/libdbus-cpp3.symbols.amd64 2014-05-05 08:38:36 +0000
98+++ debian/libdbus-cpp4.symbols.amd64 2014-07-18 09:34:33 +0000
99@@ -1,2 +1,2 @@
100-libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
101-#include "libdbus-cpp3.symbols.64bit"
102+libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
103+#include "libdbus-cpp4.symbols.64bit"
104
105=== renamed file 'debian/libdbus-cpp3.symbols.arm64' => 'debian/libdbus-cpp4.symbols.arm64'
106--- debian/libdbus-cpp3.symbols.arm64 2014-05-05 08:38:36 +0000
107+++ debian/libdbus-cpp4.symbols.arm64 2014-07-18 09:34:33 +0000
108@@ -1,2 +1,2 @@
109-libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
110-#include "libdbus-cpp3.symbols.64bit"
111+libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
112+#include "libdbus-cpp4.symbols.64bit"
113
114=== renamed file 'debian/libdbus-cpp3.symbols.armhf' => 'debian/libdbus-cpp4.symbols.armhf'
115--- debian/libdbus-cpp3.symbols.armhf 2014-05-05 08:38:36 +0000
116+++ debian/libdbus-cpp4.symbols.armhf 2014-07-18 09:34:33 +0000
117@@ -1,2 +1,2 @@
118-libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
119-#include "libdbus-cpp3.symbols.32bit"
120+libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
121+#include "libdbus-cpp4.symbols.32bit"
122
123=== renamed file 'debian/libdbus-cpp3.symbols.coverage' => 'debian/libdbus-cpp4.symbols.coverage'
124=== renamed file 'debian/libdbus-cpp3.symbols.i386' => 'debian/libdbus-cpp4.symbols.i386'
125--- debian/libdbus-cpp3.symbols.i386 2014-05-05 08:38:36 +0000
126+++ debian/libdbus-cpp4.symbols.i386 2014-07-18 09:34:33 +0000
127@@ -1,2 +1,2 @@
128-libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
129-#include "libdbus-cpp3.symbols.32bit"
130+libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
131+#include "libdbus-cpp4.symbols.32bit"
132
133=== renamed file 'debian/libdbus-cpp3.symbols.powerpc' => 'debian/libdbus-cpp4.symbols.powerpc'
134--- debian/libdbus-cpp3.symbols.powerpc 2014-05-05 08:38:36 +0000
135+++ debian/libdbus-cpp4.symbols.powerpc 2014-07-18 09:34:33 +0000
136@@ -1,2 +1,2 @@
137-libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
138-#include "libdbus-cpp3.symbols.32bit"
139+libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
140+#include "libdbus-cpp4.symbols.32bit"
141
142=== renamed file 'debian/libdbus-cpp3.symbols.ppc64el' => 'debian/libdbus-cpp4.symbols.ppc64el'
143--- debian/libdbus-cpp3.symbols.ppc64el 2014-05-05 08:38:36 +0000
144+++ debian/libdbus-cpp4.symbols.ppc64el 2014-07-18 09:34:33 +0000
145@@ -1,2 +1,2 @@
146-libdbus-cpp.so.3 libdbus-cpp3 #MINVER#
147-#include "libdbus-cpp3.symbols.64bit"
148+libdbus-cpp.so.4 libdbus-cpp4 #MINVER#
149+#include "libdbus-cpp4.symbols.64bit"
150
151=== modified file 'debian/rules'
152--- debian/rules 2014-05-05 08:38:36 +0000
153+++ debian/rules 2014-07-18 09:34:33 +0000
154@@ -6,8 +6,10 @@
155
156 include /usr/share/dpkg/default.mk
157
158-export CC=$(DEB_HOST_GNU_TYPE)-gcc$(GCC_VERSION)
159-export CXX=$(DEB_HOST_GNU_TYPE)-g++$(GCC_VERSION)
160+# Explicitly selecting a G{CC,++}-version here to avoid accidental
161+# ABI breaks introduced by toolchain updates.
162+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
163+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
164
165 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
166
167@@ -15,7 +17,7 @@
168 dh $@
169
170 override_dh_auto_configure:
171- dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-cpp -DCMAKE_C_COMPILER=$(DEB_HOST_GNU_TYPE)-gcc$(GCC_VERSION) -DCMAKE_CXX_COMPILER=$(DEB_HOST_GNU_TYPE)-g++$(GCC_VERSION)
172+ dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-cpp -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
173
174 override_dh_auto_test:
175 if [ "$(DEB_HOST_MULTIARCH)" != "powerpc-linux-gnu" ]; then \

Subscribers

People subscribed via source and target branches