[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 02/02: s/iceweasel-dev/npapi-sdk-dev/



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 04b5fb167464d635d22fc50163d2e17de945c345
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jul 8 19:46:42 2014 +0200

    s/iceweasel-dev/npapi-sdk-dev/
---
 changelog | 1 +
 rules     | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 44fb6c0..4522e63 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +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/.
   * 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/rules b/rules
index 6bdbab8..1a167ce 100755
--- a/rules
+++ b/rules
@@ -992,8 +992,7 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
 endif
 ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
   ifneq "$(WHEEZY_BACKPORT)" "y"
-	# 30.0-1 doesn't contain the .pc file
-	BUILD_DEPS+= , iceweasel-dev (>= 30.0-2)$(OOO_NO_NSPLUGIN_ARCHS)
+	BUILD_DEPS+= , npapi-sdk-dev$(OOO_NO_NSPLUGIN_ARCHS)
   else
 	BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
   endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: