r51769 - in /desktop/experimental/glib2.0: ./ debian/changelog debian/rules

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Nov 23 17:12:34 2016
New Revision: 51769

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51769
Log:
Merge the unstable branch


Modified:
    desktop/experimental/glib2.0/   (props changed)
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/rules

Propchange: desktop/experimental/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Nov 23 17:12:34 2016
@@ -1,2 +1,2 @@
 /desktop/experimental/glib2.0:34881-37631,43901-45934,46852-47640
-/desktop/unstable/glib2.0:24636,27515-27547,38796-39206,41794-42178,49089-49521
+/desktop/unstable/glib2.0:24636,27515-27547,38796-39206,41794-42178,49089-49521,51734-51767

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=51769&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Nov 23 17:12:34 2016
@@ -1,10 +1,12 @@
 glib2.0 (2.51.0-2) UNRELEASED; urgency=medium
 
-  * debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
-    version from the upsstream report to hopefully fix trashing of files in
-    directories which are symlinks to different devices. (Closes: #800047)
-
- -- Iain Lane <laney at debian.org>  Wed, 16 Nov 2016 18:59:59 +0000
+  * Merge changes from 2.50.2-2:
+    + debian/rules: disable libmount on !linux (Closes: #844052)
+    + debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
+      version from the upstream report to hopefully fix trashing of files in
+      directories which are symlinks to different devices. (Closes: #800047)
+
+ -- Iain Lane <laney at debian.org>  Wed, 23 Nov 2016 16:00:56 +0000
 
 glib2.0 (2.51.0-1) experimental; urgency=medium
 
@@ -17,6 +19,15 @@
   * Update debian/libglib2.0-0.symbols.
 
  -- Iain Lane <laney at debian.org>  Wed, 16 Nov 2016 18:23:38 +0000
+
+glib2.0 (2.50.2-2) unstable; urgency=medium
+
+  * debian/rules: disable libmount on !linux (Closes: #844052)
+  * debian/patches/0001-Fix-trashing-on-overlayfs.patch: Update with new
+    version from the upstream report to hopefully fix trashing of files in
+    directories which are symlinks to different devices. (Closes: #800047)
+
+ -- Iain Lane <laney at debian.org>  Wed, 23 Nov 2016 16:33:21 +0000
 
 glib2.0 (2.50.2-1) unstable; urgency=medium
 

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=51769&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules	[utf-8] Wed Nov 23 17:12:34 2016
@@ -104,8 +104,17 @@
 			--enable-static \
 			--enable-installed-tests \
 			--enable-always-build-tests \
-			--enable-debug=minimum \
+			--enable-debug=minimum
+
+# libmount is available on linux only
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+  DEB_CONFIGURE_FLAGS_deb += \
 			--enable-libmount
+else
+  DEB_CONFIGURE_FLAGS_deb += \
+			--disable-libmount
+endif
+
 
 DEB_CONFIGURE_FLAGS_udeb := \
 			--disable-selinux \