Merge lp:~bregma/unity/unity-7.1.0 into lp:unity

[Stephen M. Webb]

release Unity 7.1.0

Release Unity 7.1.0.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3440
http://jenkins.qa.ubuntu.com/job/unity-ci/276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/165/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/164/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/276/rebuild

review: Needs Fixing (continuous-integration)

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-10 17:12:02 +0000
+++ CMakeLists.txt	2013-07-25 11:51:26 +0000
@@ -9,8 +9,8 @@
 #
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
-set (UNITY_MINOR 0)
-set (UNITY_MICRO 2)
+set (UNITY_MINOR 1)
+set (UNITY_MICRO 0)
 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-07-23 13:59:34 +0000
+++ debian/changelog	2013-07-25 11:51:26 +0000
@@ -1,3 +1,9 @@
+unity (7.1.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * upstream release 7.1.0
+
+ -- Stephen M. Webb <[e-mail]>  Wed, 24 Jul 2013 14:39:01 -0400
+
 unity (7.0.2+13.10.20130723.1-0ubuntu1) saucy; urgency=low
 
   [ Marco Trevisan (Treviño) ]