Merge lp:~mir-team/mir/bump-deb-changelog16-mirserver8 into lp:mir

[kevin gunn]

bump mir deb changelog to 0.0.16 and libmirserver8

bump mir deb changelog to 0.0.16 and libmirserver8

[Daniel van Vugt (vanvugt)]

The date in the version string needs updating:
19 +mir (0.0.16+13.10.20131011-0ubuntu1) UNRELEASED; urgency=low

review: Needs Fixing

[Chris Halse Rogers (raof)]

Do we need to include the previous “bump version 0.0.X” changelog entries? They like needless clutter.

That nit out of the way, LGTM.

review: Approve

[Daniel van Vugt (vanvugt)]

Your changelog incorrectly mentions the 0.0.15 and 0.0.16 bumps in the same version. Compare:
  http://bazaar.launchpad.net/~mir-team/mir/bump-deb-changelog16-mirserver8/view/head:/debian/changelog
  http://bazaar.launchpad.net/~mir-team/mir/trunk/view/head:/debian/changelog
Try merging from lp:mir first and then "dch -i" to create a fresh entry for 0.0.16...

Also, there's no need for a date in there. It would be nicer to have:
+mir (0.0.16-0ubuntu1) UNRELEASED; urgency=low

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1142
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/185/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/188/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Yeah that works for now.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-15 02:59:59 +0000
+++ CMakeLists.txt	2013-10-17 04:38:55 +0000
@@ -28,7 +28,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 0)
-set(MIR_VERSION_PATCH 15)
+set(MIR_VERSION_PATCH 16)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-17 04:27:22 +0000
+++ debian/changelog	2013-10-17 04:38:55 +0000
@@ -1,3 +1,9 @@
+mir (0.0.16+13.10.20131016-0ubuntu1) UNRELEASED; urgency=low
+
+  * bump version 0.0.16
+
+ -- Kevin Gunn <[e-mail]>  Wed, 16 Oct 2013 23:35:28 -0500
+
 mir (0.0.15+13.10.20131014-0ubuntu1) saucy; urgency=low
 
   [ Kevin Gunn ]

=== modified file 'debian/control'
--- debian/control	2013-10-15 02:59:59 +0000
+++ debian/control	2013-10-17 04:38:55 +0000
@@ -69,7 +69,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver7
+Package: libmirserver8
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -115,7 +115,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver7 (= ${binary:Version}),
+Depends: libmirserver8 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver7.install' => 'debian/libmirserver8.install'
--- debian/libmirserver7.install	2013-10-15 02:59:59 +0000
+++ debian/libmirserver8.install	2013-10-17 04:38:55 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.7
+usr/lib/*/libmirserver.so.8

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-10-15 02:59:59 +0000
+++ src/server/CMakeLists.txt	2013-10-17 04:38:55 +0000
@@ -88,7 +88,7 @@
   )
 endif()
 
-set(MIRSERVER_ABI 7)
+set(MIRSERVER_ABI 8)
 
 set_target_properties(
   mirserver