[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.4-1-1-g6e971aa

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 6e971aa43e4f0ecdf94b6b5674a0998a7b640440
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Feb 26 21:29:07 2011 +0800

    Only use GIO Hardware on linux-any
    
    Closes: #615126

diff --git a/debian/control b/debian/control
index ecfd6e7..e44482a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libglib2.0-cil-dev (>= 2.10),
                libgtk2.0-cil-dev (>= 2.12),
                libgconf2.0-cil-dev,
-               libgudev1.0-cil-dev (>= 0.1),
+               libgudev1.0-cil-dev (>= 0.1) [linux-any],
                libgkeyfile-cil-dev (>= 0.1),
                libgio2.0-cil-dev (>= 2.22),
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
diff --git a/debian/rules b/debian/rules
index c01f506..acb8760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,38 +4,46 @@ include /usr/share/cli-common/cli.make
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
+CONFFLAGS = \
+	--disable-static \
+	--disable-tests \
+	--with-vendor-build-id="`lsb_release -ds`" \
+	--disable-clutter \
+	--disable-builtin-equalizer \
+	--disable-gst-sharp \
+	--enable-user-help \
+	--enable-boo \
+	--enable-docs \
+	--enable-youtube \
+	--disable-hal \
+	--enable-gio \
+	--disable-moonlight \
+	--enable-gnome \
+	--enable-schemas-install \
+	--enable-mtp \
+	--enable-appledevice \
+	--disable-ipod \
+	--enable-karma \
+	--enable-daap \
+	--disable-remote-audio \
+	--disable-torrent \
+	--enable-meego \
+	--disable-soundmenu \
+	--disable-ubuntuone \
+	--enable-gapless-playback \
+	--enable-podcast \
+	--enable-release \
+	--disable-shave \
+	MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
+
+ifeq ($(shell dpkg-architecture -ilinux-any && echo yes), y)
+CONFFLAGS += --enable-gio-hardware
+else
+CONFFLAGS += --disable-gio-hardware
+endif
+
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-static \
-	                     --disable-tests \
-	                     --with-vendor-build-id="`lsb_release -ds`" \
-	                     --disable-clutter \
-	                     --disable-builtin-equalizer \
-	                     --disable-gst-sharp \
-	                     --enable-user-help \
-	                     --enable-boo \
-	                     --enable-docs \
-	                     --enable-youtube \
-	                     --disable-hal \
-	                     --enable-gio \
-	                     --enable-gio-hardware \
-	                     --disable-moonlight \
-	                     --enable-gnome \
-	                     --enable-schemas-install \
-	                     --enable-mtp \
-	                     --enable-appledevice \
-	                     --disable-ipod \
-	                     --enable-karma \
-	                     --enable-daap \
-	                     --disable-remote-audio \
-	                     --disable-torrent \
-	                     --enable-meego \
-	                     --disable-soundmenu \
-	                     --disable-ubuntuone \
-	                     --enable-gapless-playback \
-	                     --enable-podcast \
-	                     --enable-release \
-	                     --disable-shave \
-	                     MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
+	dh_auto_configure -- $(CONFFLAGS)
 
 # disable tests
 override_dh_auto_test:

-- 
banshee