./packages/openofficeorg/3.0.1/unstable r1471: - build with -openssl flavour of curl on lenny-backports
------------------------------------------------------------
revno: 1471
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2009-05-05 01:56:45 +0200
message:
- build with -openssl flavour of curl on lenny-backports
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-05-04 23:30:17 +0000
+++ b/changelog 2009-05-04 23:56:45 +0000
@@ -6,10 +6,11 @@
- fix GCC_VERSION handling to work again with OOo build calling
e.g. i486-linux-gnu-gcc
- keep -kde/-kab enabled on lenny-backports
+ - build with -openssl flavour of curl on lenny-backports
* debian/watch: move from ftp.stardiv.de (not master anymore) to
ftp.gwdg.de
- -- Rene Engelhard <rene@debian.org> Thu, 30 Apr 2009 01:02:53 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 05 May 2009 01:54:54 +0200
openoffice.org (1:3.0.1-11) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-05-04 23:30:17 +0000
+++ b/rules 2009-05-04 23:56:45 +0000
@@ -169,6 +169,7 @@
RUN_API_TESTS=n
RUN_UNIT_TESTS=n
USE_LIBCURL4=y
+CURL_SECTYPE=gnutls
USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.2.0-2)
@@ -263,6 +264,7 @@
LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
SUITESPARSE_MIN_VERSION= (>= 3.1.0)
BUILD_KDE=y
+ CURL_SECTYPE=openssl
endif
#############
@@ -418,9 +420,9 @@
endif
ifeq "$(USE_LIBCURL4)" "y"
- BUILD_DEPS += , libcurl4-gnutls-dev
+ BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev
else
- BUILD_DEPS += , libcurl3-gnutls-dev
+ BUILD_DEPS += , libcurl3-$(CURL_SECTYPE)-dev
endif
ifeq "$(SYSTEM_OPENSSL)" "y"
Reply to: