[Pkg-xfce-commits] r9124 - in /desktop/trunk/xfce4-session/debian: changelog rules

[Yves-Alexis Perez]

Author: corsac
Date: Mon May 11 19:01:22 2015
New Revision: 9124

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9124
Log:
* debian/rules:
  - use linux suspend/hibernate backend for Linux and Hurd, freebsd one for
  kFreeBSD.

Modified:
    desktop/trunk/xfce4-session/debian/changelog
    desktop/trunk/xfce4-session/debian/rules

Modified: desktop/trunk/xfce4-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/changelog?rev=9124&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/changelog	(original)
+++ desktop/trunk/xfce4-session/debian/changelog	Mon May 11 19:01:22 2015
@@ -1,3 +1,11 @@
+xfce4-session (4.12.1-3) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - use linux suspend/hibernate backend for Linux and Hurd, freebsd one for
+    kFreeBSD.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 11 May 2015 20:56:57 +0200
+
 xfce4-session (4.12.1-2) unstable; urgency=medium
 
   * Upload to unstable.

Modified: desktop/trunk/xfce4-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/rules?rev=9124&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/rules	(original)
+++ desktop/trunk/xfce4-session/debian/rules	Mon May 11 19:01:22 2015
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+
+# get the various DEB_BUILD/DEB_HOST variables
+include /usr/share/dpkg/architecture.mk
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -10,8 +13,14 @@
 override_dh_strip:
 	dh_strip --dbg-package=xfce4-session-dbg
 
+# default backend for Linux and Hurd
+BACKEND=linux
+ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
+	BACKEND=freebsd
+endif
+
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-silent-rules --disable-legacy-sm
+	dh_auto_configure -- --disable-silent-rules --disable-legacy-sm --with-backend=$(BACKEND)
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf xdt-autogen