[libreoffice] 01/01: fix npapi-sdk builddep, it's also needed for the browser-plugins-inside-LO non-feature.
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 0647af69e2eb8be97e8256437641994df51747fc
Author: Rene Engelhard <rene@debian.org>
Date: Sun Sep 14 23:29:13 2014 +0200
fix npapi-sdk builddep, it's also needed for the browser-plugins-inside-LO non-feature.
---
changelog | 4 +++-
rules | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 5a0d5b7..b9a2abc 100644
--- a/changelog
+++ b/changelog
@@ -20,8 +20,10 @@ libreoffice (1:4.3.2~rc1-1) unstable; urgency=low
- using internal vigra
- fix duplicate BOOST_MINVER setting causing a too lax build-dep
(>= 1.49.0-4 instead of >= 1.53) for gcc >= 4.8...
+ - fix system-npapi-headers setting, npapi is also needed for the
+ browser-plugins-inside-LO non-feature.
- -- Rene Engelhard <rene@debian.org> Sun, 14 Sep 2014 22:37:22 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Sep 2014 23:28:45 +0200
libreoffice (1:4.3.1-1) unstable; urgency=low
diff --git a/rules b/rules
index 6dc82e6..d555691 100755
--- a/rules
+++ b/rules
@@ -401,10 +401,8 @@ ENABLE_GIO=y
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NSPLUGIN=y
- ifeq "$(PACKAGE_NSPLUGIN)" "y"
- SYSTEM_STUFF += npapi-headers
- endif
endif
+SYSTEM_STUFF += npapi-headers
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: