[SCM] libass/master: Build with --disable-asm on x32 instead of a Build-Conflict

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 30b499a21fb224deb0de41d62f4f36748a9c087f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jul 27 18:03:22 2015 +0200

    Build with --disable-asm on x32 instead of a Build-Conflict

diff --git a/debian/control b/debian/control
index c5f6ebf..826cce9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
  libfribidi-dev,
  libharfbuzz-dev,
  yasm [amd64 kfreebsd-amd64]
-Build-Conflicts: yasm [x32]
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://github.com/libass/libass
diff --git a/debian/rules b/debian/rules
index 79b7ba9..2a50dfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 
-export V=1
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 %:
 	dh $@ --parallel --with autoreconf
+
+override_dh_auto_configure:
+ifeq (,$(filter-out x32,$(shell dpkg-architecture -qDEB_HOST_ARCH)))
+	dh_auto_configure -- --disable-asm
+else
+	dh_auto_configure
+endif

-- 
LibASS packaging