------------------------------------------------------------
revno: 795
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Sun 2007-07-22 11:42:24 +0200
message:
etch backport fixes
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-07-20 13:32:53 +0000
+++ b/changelog 2007-07-22 09:42:24 +0000
@@ -31,6 +31,7 @@
completion
- don't manually split binfilters anymore
- build-depend on gperf for OOXML patchset
+ - fix some stuff for etch backports
* debian/control.in:
- build-depend on libxml-parser-perl
- Add XS-Vcs-{Bzr,Svn} fields
@@ -41,7 +42,7 @@
* merge from Ubuntu:
- make system-dmake conditional
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 20 Jul 2007 15:27:05 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 21 Jul 2007 22:02:57 +0200
openoffice.org (2.2.1-6) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2007-07-20 13:32:53 +0000
+++ b/rules 2007-07-22 09:42:24 +0000
@@ -132,6 +132,7 @@
USE_LIBCURL4=y
USE_SYSTEM_LIBSVG=y
USE_SYSTEM_DMAKE=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
@@ -194,6 +195,8 @@
LPSOLVE_MIN_VERSION=
USE_SYSTEM_LIBSVG=n
USE_SYSTEM_DMAKE=n
+ USE_LIBCURL4=n
+ USE_LIBSUITESPARSE=n
endif
#############
@@ -595,8 +598,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"
