------------------------------------------------------------
revno: 1130
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-06-21 22:08:57 +0200
message:
m20
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-06-18 19:19:21 +0000
+++ b/changelog 2008-06-21 20:08:57 +0000
@@ -1,13 +1,13 @@
-openoffice.org (1:3.0.0~dev300m19-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~dev300m20-0.1pre) experimental; urgency=low
- * OpenOffice 3.0.0 development milestone 19 (DEV300_m19)
+ * OpenOffice 3.0.0 development milestone 20 (DEV300_m20)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
- now properly complains about missing permissions when trying to write
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12915)
+ - update (r12938)
* 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.
@@ -26,13 +26,16 @@
building, still default to java-gcj-compat-dev
- move ure Java stuff to /usr/share/java (as before in -java-common)
- temporarily disable SDK package (until jsc21)
- - update get-orig-source target for fixed hyph_en_US.dic
+ - update get-orig-source target
- add --enable-gio conditional, disable it for now since it breaks OOo
- start of KDE4 support
- add BUILD_GTK conditional
- 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:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -64,7 +67,7 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 18 Jun 2008 00:21:45 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 21 Jun 2008 22:07:10 +0200
openoffice.org (1:2.4.1-3) unstable; urgency=medium
=== modified file 'rules'
--- a/rules 2008-06-18 17:37:34 +0000
+++ b/rules 2008-06-21 20:08:57 +0000
@@ -170,6 +170,8 @@
ENABLE_PRESENTER_SCREEN=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
+# broke in m20
+ENABLE_EVO2=n
ENABLE_GIO=n
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
@@ -198,7 +200,11 @@
--enable-openxml \
--with-drink=coffee \
--libdir=/usr/lib \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+ --with-system-dicts \
+ --with-external-dict-dir=/usr/share/myspell/dicts \
+ --with-external-hyph-dir=/usr/share/myspell/dicts \
+ --with-external-thes-dir=/usr/share/myspell/dicts
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -767,7 +773,11 @@
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
else
BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev
$(KDELIBS_MINVER)
+ ifeq "$(KDE_VER)" "4"
+ DBG_DBG_SUGGESTS+= , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dbg,
libqt4-dbg
+ else
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
+ endif
ifeq "$(KDE_VER)" "4"
CONFIGURE_FLAGS += --with-additional-sections="KDE4"
endif
@@ -786,6 +796,11 @@
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
endif
+ifeq "$(ENABLE_EVO2)" "y"
+ CONFIGURE_FLAGS += --disable-evolution2
+ DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-evolution
+endif
+
ifeq "$(ENABLE_RANDR)" "y"
BUILD_DEPS += , libxrandr-dev
else
@@ -1892,7 +1907,9 @@
rm -rf debian/mozilla-openoffice.org
debian/mozilla-openoffice.org.*.debhelper
rm -rf $(PKGDIR) $(PKGDIR).*.debhelper
+ifeq "$(ENABLE_EVO2)" "y"
rm -rf $(PKGDIR)-evolution $(PKGDIR)-evolution.*.debhelper
+endif
ifeq "$(BUILD_KDE)" "y"
rm -rf $(PKGDIR)-kde.*.debhelper
endif
@@ -1939,8 +1956,10 @@
endif
endif
+ifeq "$(ENABLE_EVO2)" "y"
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab2.so
$(PKGDIR)-evolution/$(OODIR)/program
+endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
# libnpsoplugins.so two times with different sizes? Oh my.
@@ -2627,14 +2646,6 @@
rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
endif
- # dictionary symlink
- rm -rf $(PKGDIR)-common/$(OODIR)/share/dict/ooo
- ln -s /usr/share/myspell/dicts \
- $(PKGDIR)-common/$(OODIR)/share/dict/ooo
- mkdir -p $(PKGDIR)-common/usr/share/myspell/dicts
- ln -s /etc/openoffice/dictionary.lst \
- $(PKGDIR)-common/usr/share/myspell/dicts/dictionary.lst
-
# convert icons to xpm; we need them for the Debian menu policy...
cd $(PKGDIR)-common/usr/share/icons/gnome/32x32/apps && \
for x in *.png; do gm convert $$x `basename $$x .png`.xpm; done
@@ -3144,8 +3155,6 @@
tar xfvj $(TAG)-core.tar.bz2 && \
rm -rf $(TAG)/external/jars && \
rm -rf $(TAG)/xalan && \
- rm $(TAG)/smoketestoo_native/statjars/README.jfreechart && \
- rm $(TAG)/smoketestoo_native/statjars/*.jar && \
for i in `find $(TAG)/psprint_config/configuration/ppds ! -name
"SGEN*" -name "*.PS"`; do \
rm $$i; \
done && \
