------------------------------------------------------------
revno: 1051
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-04-23 21:40:46 +0200
message:
adapt for sccomp
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-23 19:16:20 +0000
+++ b/changelog 2008-04-23 19:40:46 +0000
@@ -4,7 +4,7 @@
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12312)
+ - update (r12313)
* 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.
@@ -17,6 +17,8 @@
- lots of updates for removed $UPD and changed locations
- bump ant builddep ant (>= 1.7.0) to when we build the mediawiki
extension
+ - remove scsolver conditionals, not disableabe in Suns version.
+ Remove obsolete mvs
* debian/rules, debian/control.in,
debian/control.{minimizer,presenter,mediawiki}.in,
debian/openoffice.org*.{preinst,prerm,postinst}.in,
@@ -31,7 +33,7 @@
- build-depend against libxrandr-dev
* debian/copyright: LGPL v3
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Apr 2008 20:59:37 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Apr 2008 21:36:09 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-23 19:16:20 +0000
+++ b/rules 2008-04-23 19:40:46 +0000
@@ -123,7 +123,6 @@
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
KDELIBS_MINVER= (>= 4:3.4.3-2)
-ENABLE_SCSOLVER=y
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
@@ -792,25 +791,21 @@
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)
[$(OOO_SCSOLVER_ARCHS)], lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
- else
+ else
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION)
[$(OOO_SCSOLVER_ARCHS)]
- endif
+ endif
CONFIGURE_FLAGS += --with-system-lpsolve
- ifeq "$(USE_LIBSUITESPARSE)" "y"
+ ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0) [$(OOO_SCSOLVER_ARCHS)]
- else
+ else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev [$(OOO_SCSOLVER_ARCHS)]
- endif
endif
-else
- CONFIGURE_FLAGS += --disable-scsolver
endif
ifeq "$(USE_DBUS)" "y"
@@ -1011,7 +1006,6 @@
2005-10-23-huston.ppt \
scratch/buildbot \
scratch/offapi-vba/constants/constant_types.rdb \
- scratch/scsolver/workben/scsolver_boost.tar.bz2 \
src/*.ico \
src/*.jpg \
src/*.xcf \
@@ -1077,8 +1071,6 @@
scratch/buildbot/buildbot-0.7.3/docs/PyCon-2003/*.png \
scratch/offapi-vba/constants/*.rdb \
scratch/sc-vba/TestDocuments/*.xls \
- scratch/scsolver/docs/*.odg \
- scratch/scsolver/workben/testcase/*.ods \
src/*.bmp \
src/*.ico \
src/*.jpg \
@@ -1980,14 +1972,6 @@
mv $(PKGDIR)-core/$(OODIR)/program/$$i*uno.so \
$(PKGDIR)-calc/$(OODIR)/program; \
done
-ifeq "$(ENABLE_SCSOLVER)" "y"
- mv $(PKGDIR)-core/$(OODIR)/program/scsolver.uno.so \
- $(PKGDIR)-calc/$(OODIR)/program
- ifneq "$(USE_SYSTEM_LPSOLVE)" "y"
- mv $(PKGDIR)-core/$(OODIR)/program/liblpsolve55.so \
- $(PKGDIR)-calc/$(OODIR)/program
- endif
-endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
