------------------------------------------------------------
revno: 1048
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-04-23 13:58:03 +0200
message:
adapt extension configure switches for changed defaults
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-23 07:38:47 +0000
+++ b/changelog 2008-04-23 11:58:03 +0000
@@ -1,10 +1,10 @@
-openoffice.org (1:3.0.0~beta~dev300m7-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~bea300~dev300m7-0.1pre) experimental; urgency=low
* OpenOffice 3.0.0 development milestone 7 (DEV300_m7)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12113)
+ - update (r12297)
* 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.
@@ -32,7 +32,7 @@
- build-depend against libxrandr-dev
* debian/copyright: LGPL v3
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 09 Apr 2008 12:47:50 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 23 Apr 2008 13:56:31 +0200
openoffice.org (1:2.4.0-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-04-23 07:38:47 +0000
+++ b/rules 2008-04-23 11:58:03 +0000
@@ -234,6 +234,8 @@
USE_SYSTEM_ICU=n
USE_STLPORT=y
PACKAGE_WRITER2LATEX=y
+ # etchs ant too old
+ ENABLE_MEDIAWIKI=n
endif
#############
@@ -407,15 +409,15 @@
CONFIGURE_FLAGS += --disable-odk
endif
-ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-minimizer
+ifeq "$(ENABLE_MINIMIZER)" "n"
+ CONFIGURE_FLAGS += --disable-minimizer
endif
ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
CONFIGURE_FLAGS += --enable-presenter-screen
endif
-#ifeq "$(ENABLE_PDFIMPORT)" "n"
-# CONFIGURE_FLAGS += --disable-pdfimport
-#endif
+ifeq "$(ENABLE_PDFIMPORT)" "n"
+ CONFIGURE_FLAGS += --disable-pdfimport
+endif
ifeq "$(USE_LIBCURL4)" "y"
BUILD_DEPS += , libcurl4-openssl-dev [$(OOO_ARCHS)]
@@ -600,14 +602,14 @@
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- # mediawiki
- CONFIGURE_FLAGS += --enable-mediawiki
ifeq "$(USE_SYSTEM_JAVA_COMMONS)" "y"
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java [$(OOO_JAVA_ARCHS)],
libcommons-httpclient-java [$(OOO_JAVA_ARCHS)], libcommons-lang-java
[$(OOO_JAVA_ARCHS)], libcommons-logging-java [$(OOO_JAVA_ARCHS)]
MEDIAWIKI_JAR_DEPENDS := $(MEDIAWIKI_BUILD_DEPS)
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-java-commons
endif
+ else
+ CONFIGURE_FLAGS += --disable-mediawiki
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
