Merge lp:~bregma/unity/bump-to-7.1.2 into lp:unity

[Stephen M. Webb]

bumped upstream to 7.1.2

Bump upstream to 7.1.2

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3563
http://jenkins.qa.ubuntu.com/job/unity-ci/432/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/320

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/432/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3564
http://jenkins.qa.ubuntu.com/job/unity-ci/433/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/321

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/433/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Yep, it's the time! ;)

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-27 11:00:21 +0000
+++ CMakeLists.txt	2013-10-10 15:04:00 +0000
@@ -10,7 +10,7 @@
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
 set (UNITY_MINOR 1)
-set (UNITY_MICRO 1)
+set (UNITY_MICRO 2)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-04 05:23:43 +0000
+++ debian/changelog	2013-10-10 15:04:00 +0000
@@ -1,3 +1,9 @@
+unity (7.1.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * bump upstream version to 7.1.2
+
+ -- Stephen M. Webb <[e-mail]>  Thu, 10 Oct 2013 09:41:09 -0400
+
 unity (7.1.1+13.10.20131004-0ubuntu1) saucy; urgency=low
 
   [ Brandon Schaefer ]