------------------------------------------------------------
revno: 1390
committer: Rene Engelhard <[email protected]>
branch nick: 31
timestamp: Tue 2009-01-20 16:51:57 +0100
message:
reenable wiki-publisher and presenter-console as configuretoplevel is
integrated; remove obsolete changelog entry
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-20 14:14:56 +0000
+++ b/changelog 2009-01-20 15:51:57 +0000
@@ -24,10 +24,7 @@
old one to not bump shlibs unnecessarily)
- add conditional for enabling graphite, now that ooo-build has a surrected
--enable-graphite again (and upstream a cws for it)
- - temporarily disable the Report Builder, Wiki Editor and Presenter Console
- extensions
- - temporarily hardcode 3.0 in -debian-menu extraction, as current 3.1
- snapshot still has 3.0 in there..
+ - temporarily disable the Report Builder extension
- move install of make install-installed file from cp -a to dh_install;
this also moves hid.lst to -qa-tools
- explicitely specify --with-stlport in USE_STLPORT=y case as
=== modified file 'rules'
--- a/rules 2009-01-20 14:14:56 +0000
+++ b/rules 2009-01-20 15:51:57 +0000
@@ -182,14 +182,14 @@
ifeq "$(ENABLE_JAVA)" "y"
ENABLE_REPORTDESIGN=n
USE_SYSTEM_JFREEREPORT=y
- ENABLE_MEDIAWIKI=n
+ ENABLE_MEDIAWIKI=y
USE_SYSTEM_APACHE_COMMONS=y
else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
ENABLE_MINIMIZER=y
-ENABLE_PRESENTER_CONSOLE=n
+ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
ENABLE_EVO2=y
