r43395 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sun Oct  5 02:03:15 2014
New Revision: 43395

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43395
Log:
* Do not enable networkmanager support on !linux architectures
* debian/control.in: Add libnm-util-dev to the build-dependencies

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/rules

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=43395&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] Sun Oct  5 02:03:15 2014
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.14.0-2) UNRELEASED; urgency=medium
+
+  * Do not enable networkmanager support on !linux architectures
+  * debian/control.in: Add libnm-util-dev to the build-dependencies
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 05 Oct 2014 04:02:19 +0200
+
 gnome-settings-daemon (3.14.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=43395&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control	[utf-8] Sun Oct  5 02:03:15 2014
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 9),
                gnome-pkg-tools,
@@ -16,7 +16,8 @@
                intltool (>= 0.37.1),
                libglib2.0-dev (>= 2.37.7),
                libgtk-3-dev (>= 3.7.8),
-               libnm-glib-dev (>= 0.9.9.1),
+               libnm-glib-dev (>= 0.9.9.1) [linux-any],
+               libnm-util-dev (>= 0.9.9.1) [linux-any],
                libnotify-dev (>= 0.7.3),
                libxt-dev,
                libxi-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=43395&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in	[utf-8] Sun Oct  5 02:03:15 2014
@@ -12,7 +12,8 @@
                intltool (>= 0.37.1),
                libglib2.0-dev (>= 2.37.7),
                libgtk-3-dev (>= 3.7.8),
-               libnm-glib-dev (>= 0.9.9.1),
+               libnm-glib-dev (>= 0.9.9.1) [linux-any],
+               libnm-util-dev (>= 0.9.9.1) [linux-any],
                libnotify-dev (>= 0.7.3),
                libxt-dev,
                libxi-dev,

Modified: desktop/unstable/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/rules?rev=43395&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/rules	[utf-8] Sun Oct  5 02:03:15 2014
@@ -15,7 +15,7 @@
 LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
 
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-  DEB_CONFIGURE_EXTRA_FLAGS += --disable-rfkill
+  DEB_CONFIGURE_EXTRA_FLAGS += --disable-rfkill --disable-network-manager
 else
 install/gnome-settings-daemon::
 	dh_install -pgnome-settings-daemon --ignore=debian/gnome-settings-daemon.install \