r39667 - in /desktop/experimental/glib2.0/debian: changelog libglib2.0-0.symbols patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch patches/series rules

laney at users.alioth.debian.org laney at users.alioth.debian.org
Wed Sep 25 10:37:26 UTC 2013


Author: laney
Date: Wed Sep 25 10:37:26 2013
New Revision: 39667

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39667
Log:
* New upstream release
* debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch:
  Cherry-pick patch from upstream to fix object path typo in gio (LP:
  #1227295)
* Add --enable-debug=minimal explicitly to the deb build so the debugging
  level doesn't change between pre-release and stable versions. 

Added:
    desktop/experimental/glib2.0/debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/libglib2.0-0.symbols
    desktop/experimental/glib2.0/debian/patches/series
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=39667&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Sep 25 10:37:26 2013
@@ -1,3 +1,14 @@
+glib2.0 (2.38.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch:
+    Cherry-pick patch from upstream to fix object path typo in gio (LP:
+    #1227295)
+  * Add --enable-debug=minimal explicitly to the deb build so the debugging
+    level doesn't change between pre-release and stable versions. 
+
+ -- Iain Lane <laney at debian.org>  Tue, 24 Sep 2013 16:03:49 +0000
+
 glib2.0 (2.37.93-1) experimental; urgency=low
 
   * New upstream release 2.37.93 (& .92)

Modified: desktop/experimental/glib2.0/debian/libglib2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.symbols?rev=39667&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.symbols	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.symbols	[utf-8] Wed Sep 25 10:37:26 2013
@@ -2794,7 +2794,6 @@
  g_slice_alloc0 at Base 2.12.0
  g_slice_alloc at Base 2.12.0
  g_slice_copy at Base 2.14.0
- g_slice_debug_tree_statistics at Base 2.37.0
  g_slice_free1 at Base 2.12.0
  g_slice_free_chain_with_offset at Base 2.12.0
  g_slice_get_config at Base 2.12.0

Added: desktop/experimental/glib2.0/debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch?rev=39667&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch	[utf-8] Wed Sep 25 10:37:26 2013
@@ -0,0 +1,36 @@
+From 74314de4d8c13b817fe433a8ff4c5a249cd1d722 Mon Sep 17 00:00:00 2001
+From: James Strandboge <jamie at strandboge.com>
+Date: Tue, 24 Sep 2013 13:19:20 +0100
+Subject: [PATCH] gio: Fix typo in the /org/freedesktop/DBus path
+
+https://bugzilla.gnome.org/show_bug.cgi?id=708677
+https://bugs.launchpad.net/ubuntu/+source/glib2.0/+bug/1227295
+---
+ gio/gdbusobjectmanagerclient.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
+index 6a26654..ed0adc0 100644
+--- a/gio/gdbusobjectmanagerclient.c
++++ b/gio/gdbusobjectmanagerclient.c
+@@ -1113,7 +1113,7 @@ subscribe_signals (GDBusObjectManagerClient *manager,
+ 
+       ret = g_dbus_connection_call_sync (manager->priv->connection,
+                                          "org.freedesktop.DBus",
+-                                         "/org/freedeskop/DBus",
++                                         "/org/freedesktop/DBus",
+                                          "org.freedesktop.DBus",
+                                          "AddMatch",
+                                          g_variant_new ("(s)",
+@@ -1198,7 +1198,7 @@ maybe_unsubscribe_signals (GDBusObjectManagerClient *manager)
+        */
+       g_dbus_connection_call (manager->priv->connection,
+                               "org.freedesktop.DBus",
+-                              "/org/freedeskop/DBus",
++                              "/org/freedesktop/DBus",
+                               "org.freedesktop.DBus",
+                               "RemoveMatch",
+                               g_variant_new ("(s)",
+-- 
+1.8.3.2
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=39667&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Wed Sep 25 10:37:26 2013
@@ -11,3 +11,4 @@
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 skip-brokwn-dbus-appinfo-test.patch
+0001-gio-Fix-typo-in-the-org-freedesktop-DBus-path.patch

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=39667&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules	[utf-8] Wed Sep 25 10:37:26 2013
@@ -85,7 +85,8 @@
 			--enable-gtk-doc \
 			--enable-static \
 			--enable-installed-tests \
-			--enable-always-build-tests
+			--enable-always-build-tests \
+			--enable-debug=minimal
 
 DEB_CONFIGURE_FLAGS_udeb := \
 			--disable-selinux




More information about the pkg-gnome-commits mailing list