Ubuntu balsa 2.4.1-1ubuntu1

[Ubuntu Merge-o-Matic <mom ubuntu com>]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.

Format: 1.8
Date: Mon, 23 May 2011 15:05:20 +0200
Source: balsa
Binary: balsa balsa-dbg
Architecture: source
Version: 2.4.1-1ubuntu1
Distribution: oneiric
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss lists ubuntu com>
Changed-By: Sebastien Bacher <seb128 ubuntu com>
Description: 
 balsa      - An e-mail client for GNOME
 balsa-dbg  - An e-mail client for GNOME
Changes: 
 balsa (2.4.1-1ubuntu1) oneiric; urgency=low
 .
   * debian/patches/use_new_libnotify.patch,debian/control.in: use new libnotify
Checksums-Sha1: 
 ad6675cc60bcfd5f8f573f272ca2eea1f0fac31b 1801 balsa_2.4.1-1ubuntu1.dsc
 afbb20289bb9754b7ac411e904868f67cd54b87a 14057 balsa_2.4.1-1ubuntu1.diff.gz
Checksums-Sha256: 
 55fcaf4c4acbbbe2c30e33d6ed882afd6a2774ad10c6ad08f8faa55b13ac91cd 1801 balsa_2.4.1-1ubuntu1.dsc
 02d95ad709004fd57cd91039c0a932b4b42c17b3cfbc85e6fa0c73a939070ab8 14057 balsa_2.4.1-1ubuntu1.diff.gz
Files: 
 4cec8f310e48c2600c8f6c054b118a82 1801 gnome optional balsa_2.4.1-1ubuntu1.dsc
 e6f163fc2ed301acf112b2b2a81bb87e 14057 gnome optional balsa_2.4.1-1ubuntu1.diff.gz
Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>

diff -pruN 2.4.1-1build2/debian/changelog 2.4.1-1ubuntu1/debian/changelog
--- 2.4.1-1build2/debian/changelog	2011-05-23 17:12:39.000000000 +0100
+++ 2.4.1-1ubuntu1/debian/changelog	2011-05-23 17:12:38.000000000 +0100
@@ -1,3 +1,9 @@
+balsa (2.4.1-1ubuntu1) oneiric; urgency=low
+
+  * debian/patches/use_new_libnotify.patch,debian/control.in: use new libnotify
+
+ -- Sebastien Bacher <seb128 ubuntu com>  Mon, 23 May 2011 15:05:20 +0200
+
 balsa (2.4.1-1build2) oneiric; urgency=low
 
   * Rebuild for OpenSSL 1.0.0.
diff -pruN 2.4.1-1build2/debian/control 2.4.1-1ubuntu1/debian/control
--- 2.4.1-1build2/debian/control	2011-05-23 17:12:39.000000000 +0100
+++ 2.4.1-1ubuntu1/debian/control	2011-05-23 17:12:38.000000000 +0100
@@ -6,7 +6,8 @@
 Source: balsa
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss lists ubuntu com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.37),
                debhelper (>= 5.0),
@@ -34,11 +35,11 @@ Build-Depends: autotools-dev,
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.14.0),
                liborbit2-dev,
-               libnotify-dev,
+               libnotify-dev (>= 0.6.1),
                libxml2-dev,
                intltool
-Uploaders: Alan Baghumian <alan technotux org>, Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>
-Standards-Version: 3.8.3
+Uploaders: Alan Baghumian <alan technotux org>, Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>
+Standards-Version: 3.9.2
 
 Package: balsa
 Architecture: any
diff -pruN 2.4.1-1build2/debian/control.in 2.4.1-1ubuntu1/debian/control.in
--- 2.4.1-1build2/debian/control.in	2011-05-23 17:12:39.000000000 +0100
+++ 2.4.1-1ubuntu1/debian/control.in	2011-05-23 17:12:38.000000000 +0100
@@ -1,7 +1,8 @@
 Source: balsa
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss lists ubuntu com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.37),
                debhelper (>= 5.0),
@@ -29,11 +30,11 @@ Build-Depends: autotools-dev,
                libglib2.0-dev (>= 2.16.0),
                libgtk2.0-dev (>= 2.14.0),
                liborbit2-dev,
-               libnotify-dev,
+               libnotify-dev (>= 0.6.1),
                libxml2-dev,
                intltool
 Uploaders: Alan Baghumian <alan technotux org>, @GNOME_TEAM@
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 
 Package: balsa
 Architecture: any
diff -pruN 2.4.1-1build2/debian/patches/use_new_libnotify.patch 2.4.1-1ubuntu1/debian/patches/use_new_libnotify.patch
--- 2.4.1-1build2/debian/patches/use_new_libnotify.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.4.1-1ubuntu1/debian/patches/use_new_libnotify.patch	2011-05-23 17:12:38.000000000 +0100
@@ -0,0 +1,24 @@
+diff -Nur -x '*.orig' -x '*~' balsa-2.4.1//libbalsa/information.c balsa-2.4.1.new//libbalsa/information.c
+--- balsa-2.4.1//libbalsa/information.c	2009-05-23 09:02:12.000000000 +0200
++++ balsa-2.4.1.new//libbalsa/information.c	2011-05-23 15:04:36.863252614 +0200
+@@ -99,7 +99,7 @@
+         g_free(msg);
+ 
+         note =
+-            notify_notification_new("Balsa", escaped->str, icon_str, NULL);
++            notify_notification_new("Balsa", escaped->str, icon_str);
+         g_string_free(escaped, TRUE);
+ 
+         notify_notification_set_timeout(note, 7000);    /* 7 seconds */
+diff -Nur -x '*.orig' -x '*~' balsa-2.4.1//src/main-window.c balsa-2.4.1.new//src/main-window.c
+--- balsa-2.4.1//src/main-window.c	2009-07-28 23:42:23.000000000 +0200
++++ balsa-2.4.1.new//src/main-window.c	2011-05-23 15:04:55.463252623 +0200
+@@ -3302,7 +3302,7 @@
+         } else {
+             num_total = num_new;
+             balsa_app.main_window->new_mail_note =
+-                notify_notification_new("Balsa", NULL, NULL, NULL);
++                notify_notification_new("Balsa", NULL, NULL);
+             g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
+                                                new_mail_note),
+                                       (gpointer) & balsa_app.main_window->