Grail

Merge lp:~bregma/grail/release-3.1.0 into lp:grail

  1. release-3.1.0
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 255
Merged at revision: 253
Proposed branch: lp:~bregma/grail/release-3.1.0
Merge into: lp:grail
Diff against target: 36 lines (+8/-1)
3 files modified
Makefile.am (+1/-0)
configure.ac (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~bregma/grail/release-3.1.0
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+147481@code.launchpad.net

Commit message

Bump the version to 3.1.0.

Description of the change

Bump the version to 3.1.0 and fix the 'distcheck' target in preparation for doing an 'upstream' release to pick up the recent source licensing changes.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

grail (3.1.0-0ubuntu2) UNRELEASED; urgency=low
Shouldn't it be:
3.1.0-0ubuntu1 rather?

lp:~bregma/grail/release-3.1.0 updated
255. By Stephen M. Webb

debian/changelog: fixed package version and email address

Revision history for this message
Christopher Townsend (townsend) wrote :

make distcheck works like it should

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-11-20 20:13:00 +0000
3+++ Makefile.am 2013-02-11 15:34:23 +0000
4@@ -1,4 +1,5 @@
5 ACLOCAL_AMFLAGS = -I m4 --install
6+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-integration-tests
7
8 SUBDIRS = src test
9
10
11=== modified file 'configure.ac'
12--- configure.ac 2012-12-06 10:29:36 +0000
13+++ configure.ac 2013-02-11 15:34:23 +0000
14@@ -2,7 +2,7 @@
15 # Initialize Autoconf
16 AC_PREREQ([2.60])
17 AC_INIT([Gesture Recognition And Instantiation Library],
18- [3.0.9],
19+ [3.1.0],
20 [],
21 [grail])
22 AC_CONFIG_SRCDIR([Makefile.am])
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2012-12-07 06:37:45 +0000
26+++ debian/changelog 2013-02-11 15:34:23 +0000
27@@ -1,3 +1,9 @@
28+grail (3.1.0-0ubuntu1) UNRELEASED; urgency=low
29+
30+ * New upstream release to pick up licensing changes.
31+
32+ -- Stephen M. Webb <stephen.webb@canonical.com> Fri, 08 Feb 2013 17:08:13 -0500
33+
34 grail (3.0.9daily12.12.07.1-0ubuntu1) raring; urgency=low
35
36 [ Daniel d'Andrada ]

Subscribers

People subscribed via source and target branches