[SCM] gecko-mediaplayer/master: Regenerate configure on demand.

[sramacher-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9bd3e316b79bae2df704d156a9529aab1474fde4
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Mon Jan 2 11:57:58 2012 +0100

    Regenerate configure on demand.
    
    debian/control: Build-Dep on dh-autoreconf instead of autools-dev.
    debian/rules: add --with autoreconf
    debian/patches/0001-nomozalloc.patch: drop diff from configure

diff --git a/debian/control b/debian/control
index 2d2312a..c290335 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
 Uploaders: Julien Lavergne <gilir at ubuntu.com>, Aron Xu <aron at debian.org>
 Build-Depends: debhelper (>= 8),
- autotools-dev,
+ dh-autoreconf,
  pkg-config (>= 0.20),
  libglib2.0-dev (>= 2.14),
  xulrunner-dev | firefox-dev,
diff --git a/debian/patches/0001-nomozalloc.patch b/debian/patches/0001-nomozalloc.patch
index 0452411..4f0ff52 100644
--- a/debian/patches/0001-nomozalloc.patch
+++ b/debian/patches/0001-nomozalloc.patch
@@ -1,14 +1,3 @@
---- a/configure
-+++ b/configure
-@@ -7281,7 +7281,7 @@
-   withval=$with_xulrunner_sdk;
- 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
- 	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
--	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
-+	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
- 	# Check whether --enable-new-libxul was given.
- if test "${enable_new_libxul+set}" = set; then :
-   enableval=$enable_new_libxul; usenewlibxul=$enableval
 --- a/configure.in
 +++ b/configure.in
 @@ -48,7 +48,7 @@
diff --git a/debian/rules b/debian/rules
index 55600b2..dc90fe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-plugin-dir=/usr/lib/mozilla/plugins

-- 
gecko-mediaplayer packaging