------------------------------------------------------------
revno: 1525
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Tue 2009-05-05 02:00:09 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.139
committer: Rene Engelhard <r...@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:32:39 +0000
+++ b/changelog 2009-05-05 00:00:09 +0000
@@ -17,6 +17,7 @@
e.g. i486-linux-gnu-gcc
- remove changing jvmfwk3rc for adding JDBC CLASSPATHs
- 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
* debian/control.in:
=== modified file 'rules'
--- a/rules 2009-05-04 23:32:39 +0000
+++ b/rules 2009-05-05 00:00:09 +0000
@@ -177,6 +177,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)
@@ -282,6 +283,7 @@
SUITESPARSE_MIN_VERSION= (>= 3.1.0)
USE_SYSTEM_JFREEREPORT=n
BUILD_KDE=y
+ CURL_SECTYPE=openssl
endif
#############
@@ -449,9 +451,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"
