------------------------------------------------------------
revno: 785
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-07-22 12:14:10 +0200
message:
merge etch backport fixces from 2.3 branch
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-07-18 20:34:41 +0000
+++ b/changelog 2007-07-22 10:14:10 +0000
@@ -1,3 +1,11 @@
+openoffice.org (2.2.1-6.7pre) unstable; urgency=low
+
+ * merge from 2.3/experimental branch:
+ - debian/rules:
+ + fix some stuff for etch backports
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 22 Jul 2007 11:48:33 +0200
+
openoffice.org (2.2.1-6) unstable; urgency=low
* ooo-build:
=== modified file 'rules'
--- a/rules 2007-07-17 14:48:53 +0000
+++ b/rules 2007-07-22 10:14:10 +0000
@@ -129,6 +129,7 @@
PACKAGE_SDK=y
RUN_SMOKETEST=n
USE_LIBCURL4=y
+USE_LIBSUITESPARSE=y
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
@@ -188,6 +189,8 @@
HUNSPELL_MIN_VER= (>= 1.0.8-2)
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION=
+ USE_LIBCURL4=n
+ USE_LIBSUITESPARSE=n
endif
#############
@@ -566,8 +569,13 @@
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
endif
CONFIGURE_FLAGS += --with-system-lpsolve
+ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
BUILD_DEPS += , libsuitesparse-dev [$(OOO_ARCHS)]
+else
+ DBG_DBG_SUGGESTS+= , libufsparse-dbg
+ BUILD_DEPS += , libufsparse-dev [$(OOO_ARCHS)]
+endif
endif
ifeq "$(USE_DBUS)" "y"
