[libreoffice] 01/03: fix curl conditional to really add libcurl4-<whatever>-dev builddep....
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 914828bb3fee3ef1637b6dfd9cacb48301a8b0e8
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 3 18:06:24 2013 +0200
fix curl conditional to really add libcurl4-<whatever>-dev builddep....
---
changelog | 7 +++++++
control | 2 ++
rules | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 1fffcfe..1ef2a22 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.1.1-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix curl conditional to really add libcurl4-<whatever>-dev builddep....
+
+ -- Rene Engelhard <rene@debian.org> Tue, 03 Sep 2013 18:05:31 +0200
+
libreoffice (1:4.1.1-1) unstable; urgency=low
* LibreOffice 4.1.1 final (identical to rc2)
diff --git a/control b/control
index b82db9f..1d99bb0 100644
--- a/control
+++ b/control
@@ -40,6 +40,7 @@ Build-Depends: ant (>= 1.7.0),
libcmis-dev (>= 0.3.1),
libcppunit-dev (>= 1.12),
libcups2-dev,
+ libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
libebook1.2-dev,
libexpat1-dev,
@@ -4471,6 +4472,7 @@ Depends: ant (>= 1.7.0),
libcommons-logging-java (>= 1.1.1-9),
libcppunit-dev (>= 1.12),
libcups2-dev,
+ libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
libebook1.2-dev,
libexpat1-dev,
diff --git a/rules b/rules
index 5782584..25bd2ce 100755
--- a/rules
+++ b/rules
@@ -651,7 +651,7 @@ ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
BUILD_DEPS += , libpng12-dev
endif
-ifeq (,$(filter curl, $(SYSTEM_STUFF)))
+ifneq (,$(filter curl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: