r47192 - in /desktop/unstable/glib2.0/debian: changelog patches/bug712848-volume-monitor-deadlock-kfreebsd.patch patches/series rules

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Dec 23 12:27:59 2015
New Revision: 47192

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47192
Log:
* Add debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch
  - patch by and big thanks to Steven Chamberlain for debugging this!
  - given lack of feedback from upstream, which would be very welcome
    for deep changes like this, use an ifdef to only change on
    *FreeBSD for now... (Closes: #712848)
* Add --no-ddebs arg to dh_strip for refdbg package build which
  otherwise fails and I doubt we need ddeb/dbgsym for our debug
  package.

Added:
    desktop/unstable/glib2.0/debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series
    desktop/unstable/glib2.0/debian/rules

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=47192&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Wed Dec 23 12:27:59 2015
@@ -1,8 +1,19 @@
-glib2.0 (2.46.2-2) UNRELEASED; urgency=medium
-
+glib2.0 (2.46.2-2) unstable; urgency=medium
+
+  [ Iain Lane ]
   * Fix typo in previous changelog entry.
 
- -- Iain Lane <laney at debian.org>  Mon, 09 Nov 2015 15:02:58 +0000
+  [ Andreas Henriksson ]
+  * Add debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch
+    - patch by and big thanks to Steven Chamberlain for debugging this!
+    - given lack of feedback from upstream, which would be very welcome
+      for deep changes like this, use an ifdef to only change on
+      *FreeBSD for now... (Closes: #712848)
+  * Add --no-ddebs arg to dh_strip for refdbg package build which
+    otherwise fails and I doubt we need ddeb/dbgsym for our debug
+    package.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 23 Dec 2015 11:54:51 +0100
 
 glib2.0 (2.46.2-1) unstable; urgency=medium
 

Added: desktop/unstable/glib2.0/debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch?rev=47192&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch	(added)
+++ desktop/unstable/glib2.0/debian/patches/bug712848-volume-monitor-deadlock-kfreebsd.patch	[utf-8] Wed Dec 23 12:27:59 2015
@@ -0,0 +1,29 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: bug712848-volume-monitor-deadlock-kfreebsd
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712848
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=753378
+Forwarded: yes
+
+Original patch by Steven Chamberlain modified by Andreas Henriksson
+to only change on *FreeBSD until we get feedback from upstream.
+
+
+--- a/gio/gunionvolumemonitor.c
++++ b/gio/gunionvolumemonitor.c
+@@ -591,11 +591,15 @@
+   mount = NULL;
+ 
+   if (klass->get_mount_for_mount_path)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++    mount = klass->get_mount_for_mount_path (mount_path, cancellable);
++#else
+     {
+       g_rec_mutex_lock (&the_volume_monitor_mutex);
+       mount = klass->get_mount_for_mount_path (mount_path, cancellable);
+       g_rec_mutex_unlock (&the_volume_monitor_mutex);
+     }
++#endif
+ 
+   /* TODO: How do we know this succeeded? Keep in mind that the native
+    *       volume monitor may fail (e.g. not being able to connect to

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=47192&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series	[utf-8] Wed Dec 23 12:27:59 2015
@@ -12,3 +12,4 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
+bug712848-volume-monitor-deadlock-kfreebsd.patch

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=47192&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules	[utf-8] Wed Dec 23 12:27:59 2015
@@ -52,7 +52,7 @@
 
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4
 DEB_DH_MAKESHLIBS_ARGS_$(REFDBG_PKG) = --no-act
-DEB_DH_STRIP_ARGS_$(REFDBG_PKG) = --no-act
+DEB_DH_STRIP_ARGS_$(REFDBG_PKG) = --no-act --no-ddebs
 # Don't put the symbols in the -dbg package
 DEB_DH_STRIP_ARGS_$(UDEB_PKG) =