------------------------------------------------------------
revno: 890
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-09-17 14:26:04 +0200
message:
remove bogus curl conditional
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-09-17 12:18:24 +0000
+++ b/changelog 2007-09-17 12:26:04 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:2.3.0-1.2pre) experimental; urgency=low
+
+ * debian/rules:
+ - remove bogus curl conditional which was temporary but slipped in...
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 17 Sep 2007 14:22:35 +0200
+
openoffice.org (1:2.3.0-1) experimental; urgency=low
* OpenOffice.org 2.3.0 final (identical to 2.3.0rc3)
=== modified file 'rules'
--- a/rules 2007-09-17 12:18:24 +0000
+++ b/rules 2007-09-17 12:26:04 +0000
@@ -132,7 +132,6 @@
PACKAGE_SDK=y
RUN_SMOKETEST=n
RUN_UNIT_TESTS=n
-USE_SYSTEM_CURL=n
USE_LIBCURL4=y
USE_SYSTEM_LIBSVG=y
USE_SYSTEM_DMAKE=y
@@ -200,7 +199,6 @@
LPSOLVE_MIN_VERSION=
USE_SYSTEM_LIBSVG=n
USE_SYSTEM_DMAKE=n
- USE_SYSTEM_CURL=y
USE_LIBCURL4=n
USE_LIBSUITESPARSE=n
USE_SYSTEM_BOOST=y
@@ -268,13 +266,10 @@
BUILDDEB_OPTIONS = -- -Zbzip2
endif
-ifeq "$(USE_SYSTEM_CURL)" "y"
- ifeq "$(USE_LIBCURL4)" "y"
+ifeq "$(USE_LIBCURL4)" "y"
BUILD_DEPS += , libcurl4-gnutls-dev [$(OOO_ARCHS)]
- else
+else
BUILD_DEPS += , libcurl3-gnutls-dev [$(OOO_ARCHS)]
- endif
- CONFIGURE_FLAGS += --with-system-curl
endif
# libdb-dev since 4.6 but it provides libdb4.6-dev, so keep this
as-is...
