libunity

Merge lp:~mhr3/libunity/version-bump into lp:libunity

  1. version-bump
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 312
Merged at revision: 311
Proposed branch: lp:~mhr3/libunity/version-bump
Merge into: lp:libunity
Diff against target: 64 lines (+11/-5)
5 files modified
configure.ac (+2/-2)
debian/changelog (+6/-0)
debian/control (+1/-1)
unity-protocol-private.pc.in (+1/-1)
unity.pc.in (+1/-1)
To merge this branch: bzr merge lp:~mhr3/libunity/version-bump
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+204785@code.launchpad.net

Commit message

Bump version, update debian.

Description of the change

Bump version, update debian.

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

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/libunity-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libunity-ci/139/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

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-02-03 17:22:39 +0000
3+++ configure.ac 2014-02-04 21:39:32 +0000
4@@ -1,5 +1,5 @@
5 # When releasing also remember to update the soname as instructed below
6-AC_INIT(libunity, 7.1.3)
7+AC_INIT(libunity, 7.1.4)
8
9 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
10 AM_CONFIG_HEADER(config.h)
11@@ -320,4 +320,4 @@
12 Integration tests : ${enable_integration_tests}
13 Headless tests : ${enable_headless_tests}
14 Coverage reporting : ${use_gcov}
15-])
16\ No newline at end of file
17+])
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2013-11-06 05:09:23 +0000
21+++ debian/changelog 2014-02-04 21:39:32 +0000
22@@ -1,3 +1,9 @@
23+libunity (7.1.4-0ubuntu1) UNRELEASED; urgency=medium
24+
25+ * Drop dependency on libgee, clean up pc files.
26+
27+ -- Michal Hruby <michal.hruby@canonical.com> Tue, 04 Feb 2014 21:35:45 +0000
28+
29 libunity (7.1.3+14.04.20131106-0ubuntu1) trusty; urgency=low
30
31 [ Ubuntu daily release ]
32
33=== modified file 'debian/control'
34--- debian/control 2014-02-03 17:22:39 +0000
35+++ debian/control 2014-02-04 21:39:32 +0000
36@@ -9,7 +9,7 @@
37 autotools-dev,
38 pkg-config,
39 intltool,
40- valac-0.18 (>= 0.16.0),
41+ valac (>= 0.22.0),
42 libglib2.0-dev (>= 2.32.1),
43 libdee-dev (>= 1.2.5~),
44 libdbusmenu-glib-dev (>= 0.4.90),
45
46=== modified file 'unity-protocol-private.pc.in'
47--- unity-protocol-private.pc.in 2014-02-03 17:22:39 +0000
48+++ unity-protocol-private.pc.in 2014-02-04 21:39:32 +0000
49@@ -8,4 +8,4 @@
50 Version: @VERSION@
51 Libs: -L${libdir}/libunity -lunity-protocol-private
52 Cflags: -I${includedir}/unity/unity
53-Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 dee-1.0
54+Requires: glib-2.0 gobject-2.0 gio-2.0 dee-1.0
55
56=== modified file 'unity.pc.in'
57--- unity.pc.in 2014-02-03 17:22:39 +0000
58+++ unity.pc.in 2014-02-04 21:39:32 +0000
59@@ -10,4 +10,4 @@
60 Version: @VERSION@
61 Libs: -L${libdir} -lunity
62 Cflags: -I${includedir}/unity/unity
63-Requires: glib-2.0 gthread-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 dee-1.0 dbusmenu-glib-0.4
64+Requires: glib-2.0 gobject-2.0 gio-2.0 dee-1.0 dbusmenu-glib-0.4

Subscribers

People subscribed via source and target branches