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

[kevin gunn]

bump the deb changelog to 0.0.14 and libmirserver6

bump the deb changelog to 0.0.14 and libmirserver6

[PS Jenkins bot (ps-jenkins)]

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)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-03 05:12:59 +0000
+++ CMakeLists.txt	2013-10-08 23:19:38 +0000
@@ -28,7 +28,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 0)
-set(MIR_VERSION_PATCH 13)
+set(MIR_VERSION_PATCH 14)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 05:12:59 +0000
+++ debian/changelog	2013-10-08 23:19:38 +0000
@@ -1,4 +1,4 @@
-mir (0.0.13-0ubuntu1) UNRELEASED; urgency=low
+mir (0.0.14-0ubuntu1) UNRELEASED; urgency=low
 
   [ kg ]
   * bump version for ABI break (LP: #1229212)
@@ -9,7 +9,10 @@
   [ Kevin Gunn ]
   * bump version to 0.0.13
 
- -- Kevin Gunn <[e-mail]>  Wed, 02 Oct 2013 19:57:55 -0500
+  [Kevin Gunn]
+  * bump version to 0.0.14
+
+ -- Kevin Gunn <[e-mail]>  Tue, 08 Oct 2013 18:13:17 -0500
 
 mir (0.0.12+13.10.20131001.1-0ubuntu1) saucy; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2013-10-03 05:12:59 +0000
+++ debian/control	2013-10-08 23:19:38 +0000
@@ -69,7 +69,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver5
+Package: libmirserver6
 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: libmirserver5 (= ${binary:Version}),
+Depends: libmirserver6 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,
 
=== renamed file 'debian/libmirserver5.install' => 'debian/libmirserver6.install'
--- debian/libmirserver5.install	2013-10-03 05:12:59 +0000
+++ debian/libmirserver6.install	2013-10-08 23:19:38 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.5
+usr/lib/*/libmirserver.so.6
 
=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-10-03 05:12:59 +0000
+++ src/server/CMakeLists.txt	2013-10-08 23:19:38 +0000
@@ -88,7 +88,7 @@
   )
 endif()
 
-set(MIRSERVER_ABI 5)
+set(MIRSERVER_ABI 6)
 
 set_target_properties(
   mirserver