r48482 - in /desktop/unstable/nautilus/debian: changelog control control.in rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Wed May  4 06:57:31 2016
New Revision: 48482

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48482
Log:
Only enable SELinux on Linux architectures, should fix FTBFS on other ones

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/control
    desktop/unstable/nautilus/debian/control.in
    desktop/unstable/nautilus/debian/rules

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=48482&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog	[utf-8] Wed May  4 06:57:31 2016
@@ -1,3 +1,9 @@
+nautilus (3.20.1-2) UNRELEASED; urgency=medium
+
+  * Only enable SELinux on Linux architectures, should fix FTBFS on other ones
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 04 May 2016 08:45:21 +0200
+
 nautilus (3.20.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=48482&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/control	[utf-8] Wed May  4 06:57:31 2016
@@ -25,7 +25,7 @@
                gtk-doc-tools (>= 1.10),
                libxt-dev,
                libx11-dev,
-               libselinux1-dev [linux-any],
+               libselinux1-dev (>= 2.0) [linux-any],
                libxrender-dev,
                libxext-dev,
                x11proto-core-dev,

Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=48482&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/control.in	[utf-8] Wed May  4 06:57:31 2016
@@ -21,7 +21,7 @@
                gtk-doc-tools (>= 1.10),
                libxt-dev,
                libx11-dev,
-               libselinux1-dev [linux-any],
+               libselinux1-dev (>= 2.0) [linux-any],
                libxrender-dev,
                libxext-dev,
                x11proto-core-dev,

Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=48482&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules	[utf-8] (original)
+++ desktop/unstable/nautilus/debian/rules	[utf-8] Wed May  4 06:57:31 2016
@@ -14,10 +14,17 @@
 ENABLE_TRACKER := --disable-tracker
 endif
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ENABLE_SELINUX := --enable-selinux
+else
+ENABLE_SELINUX := --disable-selinux
+endif
+
 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus \
                              --disable-update-mimedb \
                              --enable-packagekit \
                              --enable-introspection \
+                             $(ENABLE_SELINUX) \
                              $(ENABLE_TRACKER)
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1a += -V 'libnautilus-extension1a (>= 2.91)'