[SCM] gecko-mediaplayer/experimental: Build with -DMOZ_NO_MOZALLOC again

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6c8864adb4e8d4a5e23f1b0111130bd658fb4b7a
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Dec 15 01:40:23 2012 +0100

    Build with -DMOZ_NO_MOZALLOC again
    
    The proper flags for ./configure got lost in 1.0.5-1. Furthermore
    -DMOZ_NO_MOZALLOC wasn't set correctly.

diff --git a/debian/changelog b/debian/changelog
index eac317b..8ba673e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gecko-mediaplayer (1.0.7-2) UNRELEASED; urgency=low
 
-  * 
+  * debian/rules: Build with -DMOZ_NO_MOZALLOC again. The proper flags for
+    ./configure got lost in 1.0.5-1.
 
  -- Sebastian Ramacher <sramacher at debian.org>  Sat, 15 Dec 2012 01:04:31 +0100
 
diff --git a/debian/rules b/debian/rules
index f0f68ed..eb4213c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 export DEB_CXXFLAGS_MAINT_APPEND=-std=gnu++0x
-export DEB_CPPLAGS_MAINT_APPEND=-DMOZ_NO_ALLOC
+export DEB_CPPFLAGS_MAINT_APPEND=-DMOZ_NO_MOZALLOC
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed
 
 # Build with verbose build output
@@ -14,7 +14,9 @@ export V=1
 	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-plugin-dir=/usr/lib/mozilla/plugins
+	dh_auto_configure -- \
+		--with-plugin-dir=/usr/lib/mozilla/plugins \
+		--with-xulrunner-sdk=$(shell pkg-config libxul --variable=sdkdir)
 
 override_dh_auto_install:
 	dh_auto_install

-- 
gecko-mediaplayer packaging