[libreoffice] 01/01: Re-enable system-npapi-headers
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a57d238db5ddccd488f40c77055f71455dbf6866
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 9 07:25:48 2014 +0200
Re-enable system-npapi-headers
---
changelog | 2 +-
control | 2 ++
rules | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 4522e63..2d1d870 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,7 @@ libreoffice (1:4.2.5-2) UNRELEASED; urgency=low
- remove liborbit2-dev build-dep, not needed since some time
- don't uselessly rebuild sdext - it's not a extension anymore and thus in
"proper" langpacks
- - s/iceweasel-dev/npapi-sdk-dev/.
+ - s/iceweasel-dev/npapi-sdk-dev/. Re-enable system-npapi-headers
* debian/control.debug.in: suggest python-six (used by the gdb helpers)
* debian/control.in, debian/rules: specify -b in Vcs-Git:
diff --git a/control b/control
index 2ff2783..789a294 100644
--- a/control
+++ b/control
@@ -122,6 +122,7 @@ Build-Depends: ant (>= 1.7.0),
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
+ npapi-sdk-dev,
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
@@ -4571,6 +4572,7 @@ Depends: ant (>= 1.7.0),
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
+ npapi-sdk-dev,
openjdk-7-jdk,
pkg-config,
python (>= 2.6.6-3+squeeze4),
diff --git a/rules b/rules
index 1a167ce..5be13dc 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: