r29320 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in patches/14_libnotify_0.7.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Aug 2 03:14:32 UTC 2011
Author: biebl
Date: Tue Aug 2 03:14:31 2011
New Revision: 29320
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29320
Log:
* Update for libnotify 0.7. Closes: #630277
- Bump Build-Depends on libnotify-dev to (>= 0.7.0).
- Add debian/patches/14_libnotify_0.7.patch.
Added:
desktop/unstable/gnome-settings-daemon/debian/patches/14_libnotify_0.7.patch
Modified:
desktop/unstable/gnome-settings-daemon/debian/changelog
desktop/unstable/gnome-settings-daemon/debian/control
desktop/unstable/gnome-settings-daemon/debian/control.in
desktop/unstable/gnome-settings-daemon/debian/patches/series
Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=29320&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Tue Aug 2 03:14:31 2011
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.30.2-4) UNRELEASED; urgency=low
+
+ * Update for libnotify 0.7. Closes: #630277
+ - Bump Build-Depends on libnotify-dev to (>= 0.7.0).
+ - Add debian/patches/14_libnotify_0.7.patch.
+
+ -- Michael Biebl <biebl at debian.org> Tue, 02 Aug 2011 05:13:08 +0200
+
gnome-settings-daemon (2.30.2-3) unstable; urgency=low
* 11_retry-startup.patch: when starting the Xsettings manager, try
Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=29320&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control [utf-8] Tue Aug 2 03:14:31 2011
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
autotools-dev,
@@ -17,7 +17,7 @@
libgtk2.0-dev (>= 2.16.0),
libgconf2-dev (>= 2.6.1),
libgnome-desktop-dev (>= 2.29.92),
- libnotify-dev (>= 0.4.3),
+ libnotify-dev (>= 0.7.0),
libxt-dev,
libxi-dev,
libxrandr-dev,
Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=29320&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] Tue Aug 2 03:14:31 2011
@@ -12,7 +12,7 @@
libgtk2.0-dev (>= 2.16.0),
libgconf2-dev (>= 2.6.1),
libgnome-desktop-dev (>= 2.29.92),
- libnotify-dev (>= 0.4.3),
+ libnotify-dev (>= 0.7.0),
libxt-dev,
libxi-dev,
libxrandr-dev,
Added: desktop/unstable/gnome-settings-daemon/debian/patches/14_libnotify_0.7.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/14_libnotify_0.7.patch?rev=29320&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/14_libnotify_0.7.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/14_libnotify_0.7.patch [utf-8] Tue Aug 2 03:14:31 2011
@@ -1,0 +1,50 @@
+Index: gnome-settings-daemon-2.30.2/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+===================================================================
+--- gnome-settings-daemon-2.30.2.orig/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c 2011-08-02 05:07:53.074089035 +0200
++++ gnome-settings-daemon-2.30.2/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c 2011-08-02 05:08:48.041398002 +0200
+@@ -536,9 +536,7 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
+- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++ "preferences-desktop-accessibility");
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+@@ -675,9 +673,7 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
+- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++ "preferences-desktop-accessibility");
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+Index: gnome-settings-daemon-2.30.2/plugins/xrandr/gsd-xrandr-manager.c
+===================================================================
+--- gnome-settings-daemon-2.30.2.orig/plugins/xrandr/gsd-xrandr-manager.c 2011-08-02 05:09:03.025209630 +0200
++++ gnome-settings-daemon-2.30.2/plugins/xrandr/gsd-xrandr-manager.c 2011-08-02 05:09:36.464789237 +0200
+@@ -913,16 +913,9 @@
+
+ g_assert (error_to_display == NULL || secondary_text == NULL);
+
+- if (priv->status_icon)
+- notification = notify_notification_new_with_status_icon (primary_text,
+- error_to_display ? error_to_display->message : secondary_text,
+- GSD_XRANDR_ICON_NAME,
+- priv->status_icon);
+- else
+- notification = notify_notification_new (primary_text,
+- error_to_display ? error_to_display->message : secondary_text,
+- GSD_XRANDR_ICON_NAME,
+- NULL);
++ notification = notify_notification_new (primary_text,
++ error_to_display ? error_to_display->message : secondary_text,
++ GSD_XRANDR_ICON_NAME);
+
+ notify_notification_show (notification, NULL); /* NULL-GError */
+ #else
Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=29320&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Tue Aug 2 03:14:31 2011
@@ -5,6 +5,7 @@
11_retry-startup.patch
12_monitor_network_fs.patch
13_monitor_kfreebsd.patch
+14_libnotify_0.7.patch
20_gstreamer.patch
30_pkgconfig-path.patch
70_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list