Unity

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

  1. bump-to-7.1.2
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3565
Proposed branch: lp:~bregma/unity/bump-to-7.1.2
Merge into: lp:unity
Diff against target: 26 lines (+7/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~bregma/unity/bump-to-7.1.2
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+190388@code.launchpad.net

Commit message

bumped upstream to 7.1.2

Description of the change

Bump upstream to 7.1.2

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Yep, it's the time! ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-27 11:00:21 +0000
3+++ CMakeLists.txt 2013-10-10 15:04:00 +0000
4@@ -10,7 +10,7 @@
5 set (PROJECT_NAME "unity")
6 set (UNITY_MAJOR 7)
7 set (UNITY_MINOR 1)
8-set (UNITY_MICRO 1)
9+set (UNITY_MICRO 2)
10 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
11 set (UNITY_API_VERSION "6.0")
12 set (UNITY_COMPONENTS_VERSION "6")
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-10-04 05:23:43 +0000
16+++ debian/changelog 2013-10-10 15:04:00 +0000
17@@ -1,3 +1,9 @@
18+unity (7.1.2-0ubuntu1) UNRELEASED; urgency=low
19+
20+ * bump upstream version to 7.1.2
21+
22+ -- Stephen M. Webb <stephen.webb@canonical.com> Thu, 10 Oct 2013 09:41:09 -0400
23+
24 unity (7.1.1+13.10.20131004-0ubuntu1) saucy; urgency=low
25
26 [ Brandon Schaefer ]