Merge lp:~mir-team/mir/bump-deb-changelog15-mirserver7 into lp:mir

[kevin gunn]

bump debian version 0.0.15 and libmirserver7

bump debian version 0.0.15 and libmirserver7

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/163/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2236
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/160/console

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

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-11 07:41:45 +0000
+++ CMakeLists.txt	2013-10-14 19:08:26 +0000
@@ -28,7 +28,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 0)
-set(MIR_VERSION_PATCH 14)
+set(MIR_VERSION_PATCH 15)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 15:55:17 +0000
+++ debian/changelog	2013-10-14 19:08:26 +0000
@@ -1,3 +1,9 @@
+mir (0.0.15+13.10.20131011-0ubuntu1) UNRELEASED; urgency=low
+
+  * bump version 0.0.15
+
+ -- Kevin Gunn <[e-mail]>  Mon, 14 Oct 2013 13:52:10 -0500
+
 mir (0.0.14+13.10.20131011-0ubuntu1) saucy; urgency=low
 
   [ thomas-voss ]

=== modified file 'debian/control'
--- debian/control	2013-10-10 22:50:34 +0000
+++ debian/control	2013-10-14 19:08:26 +0000
@@ -69,7 +69,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver6
+Package: libmirserver7
 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: libmirserver6 (= ${binary:Version}),
+Depends: libmirserver7 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver6.install' => 'debian/libmirserver7.install'
--- debian/libmirserver6.install	2013-10-09 07:04:15 +0000
+++ debian/libmirserver7.install	2013-10-14 19:08:26 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.6
+usr/lib/*/libmirserver.so.7

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2013-10-09 07:04:15 +0000
+++ src/server/CMakeLists.txt	2013-10-14 19:08:26 +0000
@@ -88,7 +88,7 @@
   )
 endif()
 
-set(MIRSERVER_ABI 6)
+set(MIRSERVER_ABI 7)
 
 set_target_properties(
   mirserver