Mir

Merge lp:~mir-team/mir/bump-deb-changelog14-mirserver6 into lp:mir

  1. bump-deb-changelog14-mirserver6
  2. Merge into development-branch
Proposed by kevin gunn
Status: Merged
Approved by: Robert Ancell
Approved revision: no longer in the source branch.
Merged at revision: 1117
Proposed branch: lp:~mir-team/mir/bump-deb-changelog14-mirserver6
Merge into: lp:mir
Diff against target: 76 lines (+10/-7)
5 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+5/-2)
debian/control (+2/-2)
debian/libmirserver6.install (+1/-1)
src/server/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~mir-team/mir/bump-deb-changelog14-mirserver6
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+189990@code.launchpad.net

Commit message

bump the deb changelog to 0.0.14 and libmirserver6

Description of the change

bump the deb changelog to 0.0.14 and libmirserver6

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

PASSED: Continuous integration, rev:1117
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/135/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/138/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

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 2013-10-03 05:12:59 +0000
3+++ CMakeLists.txt 2013-10-08 23:19:38 +0000
4@@ -28,7 +28,7 @@
5
6 set(MIR_VERSION_MAJOR 0)
7 set(MIR_VERSION_MINOR 0)
8-set(MIR_VERSION_PATCH 13)
9+set(MIR_VERSION_PATCH 14)
10
11 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-10-03 05:12:59 +0000
16+++ debian/changelog 2013-10-08 23:19:38 +0000
17@@ -1,4 +1,4 @@
18-mir (0.0.13-0ubuntu1) UNRELEASED; urgency=low
19+mir (0.0.14-0ubuntu1) UNRELEASED; urgency=low
20
21 [ kg ]
22 * bump version for ABI break (LP: #1229212)
23@@ -9,7 +9,10 @@
24 [ Kevin Gunn ]
25 * bump version to 0.0.13
26
27- -- Kevin Gunn <kevin.gunn@canonical.com> Wed, 02 Oct 2013 19:57:55 -0500
28+ [Kevin Gunn]
29+ * bump version to 0.0.14
30+
31+ -- Kevin Gunn <kevin.gunn@canonical.com> Tue, 08 Oct 2013 18:13:17 -0500
32
33 mir (0.0.12+13.10.20131001.1-0ubuntu1) saucy; urgency=low
34
35
36=== modified file 'debian/control'
37--- debian/control 2013-10-03 05:12:59 +0000
38+++ debian/control 2013-10-08 23:19:38 +0000
39@@ -69,7 +69,7 @@
40 .
41 Contains the protocol's definition files.
42
43-Package: libmirserver5
44+Package: libmirserver6
45 Section: libs
46 Architecture: i386 amd64 armhf arm64
47 Multi-Arch: same
48@@ -115,7 +115,7 @@
49 Architecture: i386 amd64 armhf arm64
50 Multi-Arch: same
51 Pre-Depends: ${misc:Pre-Depends}
52-Depends: libmirserver5 (= ${binary:Version}),
53+Depends: libmirserver6 (= ${binary:Version}),
54 libmirprotobuf-dev (= ${binary:Version}),
55 mircommon-dev (= ${binary:Version}),
56 libglm-dev,
57
58=== renamed file 'debian/libmirserver5.install' => 'debian/libmirserver6.install'
59--- debian/libmirserver5.install 2013-10-03 05:12:59 +0000
60+++ debian/libmirserver6.install 2013-10-08 23:19:38 +0000
61@@ -1,1 +1,1 @@
62-usr/lib/*/libmirserver.so.5
63+usr/lib/*/libmirserver.so.6
64
65=== modified file 'src/server/CMakeLists.txt'
66--- src/server/CMakeLists.txt 2013-10-03 05:12:59 +0000
67+++ src/server/CMakeLists.txt 2013-10-08 23:19:38 +0000
68@@ -88,7 +88,7 @@
69 )
70 endif()
71
72-set(MIRSERVER_ABI 5)
73+set(MIRSERVER_ABI 6)
74
75 set_target_properties(
76 mirserver

Subscribers

People subscribed via source and target branches