[libreoffice] 01/01: use internal np_sdk because the "NPAPI plugins inside LO" part doesn't build with iceweasel 30.0...
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.
commit 446578353e32a392761fc2a8db327b1de3c3e11d
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 14 10:23:49 2014 +0200
use internal np_sdk because the "NPAPI plugins inside LO" part doesn't build with iceweasel 30.0...
---
changelog | 6 ++++--
control | 2 --
rules | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index ecb60a4..203a625 100644
--- a/changelog
+++ b/changelog
@@ -12,9 +12,11 @@ libreoffice (1:4.2.5~rc2-1) UNRELEASED; urgency=medium
* debian/rules:
- micro-optimization: use --without-javadoc for build-arch and
PACKAGE_SDK_DOCS=n
- - adapt build-dep for iceweasel 30 upload: xulrunner-dev -> iceweasel-dev
+ - use internal np_sdk because the "NPAPI plugins inside LO" part doesn't
+ build (uses a internal/external header mix even with
+ --with-system-npapi-headers) with iceweasel 30.0...
- -- Rene Engelhard <rene@debian.org> Thu, 12 Jun 2014 18:35:03 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 14 Jun 2014 10:23:03 +0200
libreoffice (1:4.2.4-4) unstable; urgency=medium
diff --git a/control b/control
index 3b3d23a..d090123 100644
--- a/control
+++ b/control
@@ -28,7 +28,6 @@ Build-Depends: ant (>= 1.7.0),
gdb,
gettext,
gperf,
- iceweasel-dev (>= 30.0-2),
java-common (>= 0.49),
javahelper (>= 0.37~),
junit4 (>= 4.8.2-2),
@@ -4474,7 +4473,6 @@ Depends: ant (>= 1.7.0),
gdb,
gettext,
gperf,
- iceweasel-dev (>= 30.0-2),
java-common (>= 0.49),
javahelper (>= 0.37~),
junit4 (>= 4.8.2-2),
diff --git a/rules b/rules
index 9bb13a2..e0e0bd4 100755
--- a/rules
+++ b/rules
@@ -345,7 +345,7 @@ ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NSPLUGIN=y
ifeq "$(PACKAGE_NSPLUGIN)" "y"
- SYSTEM_STUFF += npapi-headers
+ #SYSTEM_STUFF += npapi-headers
endif
endif
PACKAGE_BASE=y
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: