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

[Ted Gould]

[Ted Gould (ted)]

0.3.4

=== modified file 'configure.ac'
--- configure.ac	2010-02-18 16:08:32 +0000
+++ configure.ac	2010-02-25 17:29:11 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicator, 0.3.3, [e-mail])
+AC_INIT(libindicator, 0.3.4, [e-mail])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicator, 0.3.3)
+AM_INIT_AUTOMAKE(libindicator, 0.3.4)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -28,7 +28,7 @@
 
 GTK_REQUIRED_VERSION=2.18
 DBUS_REQUIRED_VERSION=0.76
-GIO_UNIX_REQUIRED_VERSION=2.23
+GIO_UNIX_REQUIRED_VERSION=2.22
 
 PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-18 16:33:16 +0000
+++ debian/changelog	2010-02-25 17:29:11 +0000
@@ -1,3 +1,17 @@
+libindicator (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream Release 0.3.4
+    * Reducing gio-unix dependency to 2.22
+
+ -- Ted Gould <[e-mail]>  Thu, 25 Feb 2010 11:27:18 -0600
+
+libindicator (0.3.3-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    Reducing libglib dependency down to 2.22 for Karmic builds
+
+ -- Ted Gould <[e-mail]>  Wed, 24 Feb 2010 21:05:01 -0600
+
 libindicator (0.3.3-0ubuntu1) lucid; urgency=low
 
   * debian/control:
 
=== modified file 'debian/control'
--- debian/control	2010-02-18 16:33:16 +0000
+++ debian/control	2010-02-25 17:29:11 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
-               libglib2.0-dev (>= 2.23),
+               libglib2.0-dev (>= 2.22),
                libgtk2.0-dev (>= 2.12.0),
                libdbus-glib-1-dev,
                libtool,