Nux

Merge lp:~bregma/nux/abi-bump-20140307 into lp:nux

Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 840
Merged at revision: 842
Proposed branch: lp:~bregma/nux/abi-bump-20140307
Merge into: lp:nux
Diff against target: 35 lines (+8/-2)
2 files modified
configure.ac (+2/-2)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~bregma/nux/abi-bump-20140307
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+210087@code.launchpad.net

Commit message

bump the ABI to 20140307 and the project version to 4.0.6

Description of the change

Bump the Nux ABI to 20140307.0 to reflect an ABI change. Bump the package version to reflect the ABI bump.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2014-01-03 16:28:02 +0000
3+++ configure.ac 2014-03-09 15:59:29 +0000
4@@ -15,7 +15,7 @@
5 #
6 m4_define([nux_major_version], [4])
7 m4_define([nux_minor_version], [0])
8-m4_define([nux_micro_version], [5])
9+m4_define([nux_micro_version], [6])
10
11 m4_define([nux_api_version], [4.0])
12 # Increase the number (to the current date) everytime you propose a branch that breaks the API or ABI
13@@ -23,7 +23,7 @@
14 # e.g.: december 5th, 2011 is: 20111205
15 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
16
17-m4_define([nux_abi_version], [20131203.0])
18+m4_define([nux_abi_version], [20140307.0])
19 m4_define([nux_version],
20 [nux_major_version.nux_minor_version.nux_micro_version])
21
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2014-02-26 16:47:38 +0000
25+++ debian/changelog 2014-03-09 15:59:29 +0000
26@@ -1,3 +1,9 @@
27+nux (4.0.6-0ubuntu1) UNRELEASED; urgency=low
28+
29+ * ABI bump 20140307.0
30+
31+ -- Stephen M. Webb <stephen.webb@canonical.com> Fri, 07 Mar 2014 09:40:43 -0500
32+
33 nux (4.0.5+14.04.20140226-0ubuntu1) trusty; urgency=low
34
35 [ Chris Townsend ]

Subscribers

People subscribed via source and target branches