r39704 - in /desktop/experimental/gnome-shell/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Oct  8 15:43:26 2013
New Revision: 39704

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39704
Log:
* debian/rules:
  + Explicitly enable NetworkManager support on linux. Closes: #725760.

Modified:
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/rules

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=39704&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog	[utf-8] Tue Oct  8 15:43:26 2013
@@ -1,3 +1,10 @@
+gnome-shell (3.8.4-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    + Explicitly enable NetworkManager support on linux. Closes: #725760.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 08 Oct 2013 17:42:06 +0200
+
 gnome-shell (3.8.4-2) experimental; urgency=low
 
   * debian/patches/10-make-NetworkManager-optional.patch:

Modified: desktop/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/rules?rev=39704&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/rules	[utf-8] Tue Oct  8 15:43:26 2013
@@ -6,21 +6,25 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
 	DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=gnome-icon-theme-full
 endif
+
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	DEB_CONFIGURE_EXTRA_FLAGS += --enable-networkmanager
+endif
+
+DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell
+DEB_SHLIBDEPS_INCLUDE = /usr/lib/gnome-bluetooth
 
 $(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
 	dh_girepository -p$(cdbs_curpkg) -l src:src/gvc -p /usr/lib/mutter \
 		/usr/lib/gnome-shell
 	find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';'
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes
-
-DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell
-DEB_SHLIBDEPS_INCLUDE = /usr/lib/gnome-bluetooth
-
 # List any files which are not installed
 common-binary-post-install-arch:: list-missing