------------------------------------------------------------
revno: 1134
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Wed 2008-06-25 02:37:07 +0200
message:
reenable evoab2, fix logic
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-06-24 01:20:37 +0000
+++ b/changelog 2008-06-25 00:37:07 +0000
@@ -7,7 +7,7 @@
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12938)
+ - update (r12956)
* 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.
@@ -33,7 +33,6 @@
- reenable randr
- BUILD_ONLY_EN_US=y
- reenable mono, mono seems to be fixed on amd64
- - temporarily disable evolution2 support (FTB)
- remove spellchecking symlink and specify the new configure options for
specifying dictionary/hyphenation/thesauri paths.
* debian/rules, debian/control.in:
=== modified file 'rules'
--- a/rules 2008-06-24 05:05:00 +0000
+++ b/rules 2008-06-25 00:37:07 +0000
@@ -170,8 +170,7 @@
ENABLE_PRESENTER_SCREEN=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
-# broke in m20
-ENABLE_EVO2=n
+ENABLE_EVO2=y
ENABLE_GIO=n
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
@@ -796,7 +795,7 @@
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
endif
-ifeq "$(ENABLE_EVO2)" "y"
+ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-evolution
endif
