./packages/openofficeorg/3.0/experimental r1073: some more no-scsolver anymore fixes; m12
------------------------------------------------------------
revno: 1073
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-12 01:30:54 +0200
message:
some more no-scsolver anymore fixes; m12
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-05-06 10:11:26 +0000
+++ b/changelog 2008-05-11 23:30:54 +0000
@@ -1,10 +1,10 @@
-openoffice.org (1:3.0.0~dev300m11-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~dev300m12-0.1pre) experimental; urgency=low
- * OpenOffice 3.0.0 development milestone 11 (DEV300_m11)
+ * OpenOffice 3.0.0 development milestone 12 (DEV300_m12)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12472)
+ - update (r12517)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -38,7 +38,7 @@
* debian/copyright: LGPL v3; update
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <rene@debian.org> Tue, 06 May 2008 10:41:35 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 12 May 2008 01:24:21 +0200
openoffice.org (1:2.4.0-6.7pre) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-05-06 10:11:26 +0000
+++ b/rules 2008-05-11 23:30:54 +0000
@@ -784,22 +784,20 @@
endif
endif
-ifeq "$(ENABLE_SCSOLVER)" "y"
- ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
- ifeq "$(USE_SHARED_LPSOLVE)" "y"
+ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
+ ifeq "$(USE_SHARED_LPSOLVE)" "y"
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION), lp-solve $(LPSOLVE_MIN_VERSION)
LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
- else
+ else
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION)
- endif
+ endif
CONFIGURE_FLAGS += --with-system-lpsolve
ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0)
- else
+ else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev
- endif
endif
endif
Reply to: