libgrip

Merge lp:~bregma/libgrip/release-0.3.7 into lp:libgrip

  1. release-0.3.7
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 87
Merged at revision: 85
Proposed branch: lp:~bregma/libgrip/release-0.3.7
Merge into: lp:libgrip
Diff against target: 53 lines (+10/-3)
4 files modified
Makefile.am (+1/-1)
configure.ac (+1/-1)
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~bregma/libgrip/release-0.3.7
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+171815@code.launchpad.net

Commit message

Upstream release 0.3.7.

Description of the change

Prepares for the upstream release of libgrip 0.3.7.

Updates configure.ac and synchs packaging. Also contains some fixes for package builds.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/libgrip-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libgrip-ci/6/rebuild

review: Approve (continuous-integration)

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-22 22:16:54 +0000
3+++ Makefile.am 2013-06-27 14:29:29 +0000
4@@ -5,7 +5,7 @@
5
6 CLEANFILES = libgrip.pc
7 DISTCLEANFILES = libgrip.pc grip*.tar.gz
8-EXTRA_DIST = libgrip.pc.in m4/introspection.m4
9+EXTRA_DIST = libgrip.pc.in m4/introspection.m4 autogen.sh
10
11 ACLOCAL_AMFLAGS=-I m4
12
13
14=== modified file 'configure.ac'
15--- configure.ac 2013-05-27 14:12:59 +0000
16+++ configure.ac 2013-06-27 14:29:29 +0000
17@@ -3,7 +3,7 @@
18 #
19 m4_define([grip_major_version], [0])
20 m4_define([grip_minor_version], [3])
21-m4_define([grip_micro_version], [6])
22+m4_define([grip_micro_version], [7])
23
24 m4_define([grip_api_version],
25 [grip_major_version.grip_minor_version])
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2013-06-10 02:03:02 +0000
29+++ debian/changelog 2013-06-27 14:29:29 +0000
30@@ -1,3 +1,10 @@
31+libgrip (0.3.7-0ubuntu1) UNRELEASED; urgency=low
32+
33+ * releasing version 0.3.7
34+ * debian/control: dump Standards-Version to 3.9.4 (no changes)
35+
36+ -- Stephen M. Webb <stephen.webb@canonical.com> Thu, 27 Jun 2013 08:55:53 -0400
37+
38 libgrip (0.3.6daily13.06.10-0ubuntu1) saucy; urgency=low
39
40 [ Stephen M. Webb ]
41
42=== modified file 'debian/control'
43--- debian/control 2012-11-27 20:52:58 +0000
44+++ debian/control 2013-06-27 14:29:29 +0000
45@@ -19,7 +19,7 @@
46 libglib2.0-dev (>=2.28.6),
47 libgtk-3-dev (>= 3.0.8-0ubuntu1),
48 libgeis-dev,
49-Standards-Version: 3.9.3
50+Standards-Version: 3.9.4
51 Homepage: https://launchpad.net/libgrip
52 # If you aren't a member of ~oif-team but need to upload
53 # packaging changes, just go ahead. ~oif-team will notice

Subscribers

People subscribed via source and target branches