Merge lp:~indicator-applet-developers/libindicator/ubuntu into lp:~ubuntu-desktop/libindicator/ubuntu

Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/libindicator/ubuntu
Merge into: lp:~ubuntu-desktop/libindicator/ubuntu
Diff against target: 60 lines (+18/-4)
3 files modified
configure.ac (+3/-3)
debian/changelog (+14/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/libindicator/ubuntu
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Review via email: mp+20157@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

0.3.4

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 2010-02-18 16:08:32 +0000
3+++ configure.ac 2010-02-25 17:29:11 +0000
4@@ -1,10 +1,10 @@
5
6-AC_INIT(libindicator, 0.3.3, ted@canonical.com)
7+AC_INIT(libindicator, 0.3.4, ted@canonical.com)
8
9 AC_PREREQ(2.53)
10
11 AM_CONFIG_HEADER(config.h)
12-AM_INIT_AUTOMAKE(libindicator, 0.3.3)
13+AM_INIT_AUTOMAKE(libindicator, 0.3.4)
14
15 AM_MAINTAINER_MODE
16 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
17@@ -28,7 +28,7 @@
18
19 GTK_REQUIRED_VERSION=2.18
20 DBUS_REQUIRED_VERSION=0.76
21-GIO_UNIX_REQUIRED_VERSION=2.23
22+GIO_UNIX_REQUIRED_VERSION=2.22
23
24 PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
25 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2010-02-18 16:33:16 +0000
29+++ debian/changelog 2010-02-25 17:29:11 +0000
30@@ -1,3 +1,17 @@
31+libindicator (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
32+
33+ * Upstream Release 0.3.4
34+ * Reducing gio-unix dependency to 2.22
35+
36+ -- Ted Gould <ted@ubuntu.com> Thu, 25 Feb 2010 11:27:18 -0600
37+
38+libindicator (0.3.3-0ubuntu2) lucid; urgency=low
39+
40+ * debian/control:
41+ Reducing libglib dependency down to 2.22 for Karmic builds
42+
43+ -- Ted Gould <ted@ubuntu.com> Wed, 24 Feb 2010 21:05:01 -0600
44+
45 libindicator (0.3.3-0ubuntu1) lucid; urgency=low
46
47 * debian/control:
48
49=== modified file 'debian/control'
50--- debian/control 2010-02-18 16:33:16 +0000
51+++ debian/control 2010-02-25 17:29:11 +0000
52@@ -4,7 +4,7 @@
53 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
54 Build-Depends: debhelper (>= 5.0),
55 cdbs (>= 0.4.41),
56- libglib2.0-dev (>= 2.23),
57+ libglib2.0-dev (>= 2.22),
58 libgtk2.0-dev (>= 2.12.0),
59 libdbus-glib-1-dev,
60 libtool,

Subscribers

People subscribed via source and target branches

to all changes: