[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-4-2-gf031ba5

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 18a37d40d470b8d8904605ac8951b4825f063824
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 22 15:05:58 2012 +0200

    don't specify --with-system-mozilla-headers if not building the nsplugin...

diff --git a/changelog b/changelog
index ced8c4f..77c7a7a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.5.3-5) unstable; urgency=low
+
+  * debian/rules:
+    - don't specify --with-system-mozilla-headers if not building
+      the nsplugin... 
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 22 May 2012 14:56:19 +0200
+
 libreoffice (1:3.5.3-4) unstable; urgency=low
 
   * debian/rules: 
diff --git a/rules b/rules
index 31c6bfd..56a642d 100755
--- a/rules
+++ b/rules
@@ -259,6 +259,9 @@ ENABLE_GIO=y
 ENABLE_RANDR=y
 ifeq "$(BUILD_GTK)" "y"
   PACKAGE_NSPLUGIN=n
+  ifeq "$(PACKAGE_NSPLUGIN)" "y"
+	SYSTEM_STUFF += mozilla-headers
+  endif
 endif
 PACKAGE_BASE=y
 ENABLE_GRAPHITE=y
@@ -295,7 +298,6 @@ SYSTEM_STUFF += db
 SYSTEM_STUFF += poppler
 SYSTEM_STUFF += libpng
 SYSTEM_STUFF += nss
-SYSTEM_STUFF += mozilla-headers
 SYSTEM_STUFF += sampleicc
 PACKAGE_UNOWINREG_DLL=y
 ifeq "$(DEB_VENDOR)" "Debian"

-- 
LibreOffice packaging repository