[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.4_rc1-1-109-gec2a908
The following commit has been merged in the debian-experimental-3.7 branch:
commit 09110c7ffad44eb997244d64940da3255ac64306
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 16 10:09:43 2012 +0100
--with-system-mozilla-headers changed to --with-system-npapi-headers
diff --git a/rules b/rules
index f102e8c..61b8a3a 100755
--- a/rules
+++ b/rules
@@ -273,7 +273,7 @@ ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NSPLUGIN=y
ifeq "$(PACKAGE_NSPLUGIN)" "y"
- SYSTEM_STUFF += mozilla-headers
+ SYSTEM_STUFF += npapi-headers
endif
endif
PACKAGE_BASE=y
@@ -850,7 +850,7 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
-ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
+ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
endif
CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
--
LibreOffice packaging repository
Reply to: