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

[libreoffice] 02/02: bump iceweasel-dev build-dep to (>= 30.0-2) for .pc file



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

rene pushed a commit to branch master
in repository libreoffice.

commit 2e11d8c2d624b4fad719f4de0c9a1d3d081d115b
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jun 11 11:13:18 2014 +0200

    bump iceweasel-dev build-dep to (>= 30.0-2) for .pc file
---
 control | 4 ++--
 rules   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/control b/control
index 58cf694..928ac10 100644
--- a/control
+++ b/control
@@ -28,7 +28,7 @@ Build-Depends: ant (>= 1.7.0),
                gdb,
                gettext,
                gperf,
-               iceweasel-dev,
+               iceweasel-dev (>= 30.0-2),
                java-common (>= 0.49),
                javahelper (>= 0.37~),
                junit4 (>= 4.8.2-2),
@@ -4474,7 +4474,7 @@ Depends: ant (>= 1.7.0),
          gdb,
          gettext,
          gperf,
-         iceweasel-dev,
+         iceweasel-dev (>= 30.0-2),
          java-common (>= 0.49),
          javahelper (>= 0.37~),
          junit4 (>= 4.8.2-2),
diff --git a/rules b/rules
index 3807c41..56039ac 100755
--- a/rules
+++ b/rules
@@ -992,7 +992,8 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
 endif
 ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
   ifneq "$(WHEEZY_BACKPORT)" "y"
-	BUILD_DEPS+= , iceweasel-dev$(OOO_NO_NSPLUGIN_ARCHS)
+	# 30.0-1 doesn't contain the .pc file
+	BUILD_DEPS+= , iceweasel-dev (>= 30.0-2)$(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: