./packages/openofficeorg/3.1/experimental r1389: prepare for m40
------------------------------------------------------------
revno: 1389
committer: Rene Engelhard <rene@debian.org>
branch nick: 31
timestamp: Tue 2009-01-20 15:14:56 +0100
message:
prepare for m40
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-18 22:53:18 +0000
+++ b/changelog 2009-01-20 14:14:56 +0000
@@ -1,10 +1,13 @@
-openoffice.org (1:3.1.0~dev300m38-0.1pre) experimental; urgency=low
+openoffice.org (1:3.1.0~dev300m40-0.1pre) experimental; urgency=low
- * OpenOffice.org 3.1.0 development snapshot m38
+ * OpenOffice.org 3.1.0 development snapshot m40
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
+ - now has overline supports for word (closes: #228392)
+ - About box now fixes en-US tense and adds missing comma (closes: #470521)
+ - fixes bridges for SELinux (closes: #440105)
* ooo-build:
- - back on trunk (r15091)
+ - back on trunk (r15102)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -27,6 +30,10 @@
snapshot still has 3.0 in there..
- 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
+ ./configure now only defaults to STLport on i386. Add note
+ about STLport and some upcoming system stuff
+ - remove +OOo3.0.0~ suffix for ure/uno-libs3s .shlibs, ure is now at 1.5.0
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
=== modified file 'rules'
--- a/rules 2009-01-18 23:56:19 +0000
+++ b/rules 2009-01-20 14:14:56 +0000
@@ -268,6 +268,10 @@
LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
+# ./configure defaults to STLport on i386 and we should keep it for
+# ABI-compatability (at least until graphite01 and/or mysqlnative get in
+# at which time we need to use gccs STL if we want to use system-graphite /
+# system-mysqlcppconn)
OOO_STLPORT_ARCHS= i386
ifeq "$(ARCH)" "i386"
USE_STLPORT=y
@@ -716,6 +720,7 @@
ifneq "$(USE_STLPORT)" "y"
CONFIGURE_FLAGS += --without-stlport
else
+ CONFIGURE_FLAGS += --with-stlport
ifeq "$(USE_SYSTEM_STLPORT)" "y"
CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
endif
@@ -2526,7 +2531,7 @@
rm -f $(PKGDIR)-common/$(OODIR)/program/oo_product.bmp
# Extract and install icons
- cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract openoffice.org3.0-debian-menus_*_all.deb . && cd usr/share/icons && \
+ cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract openoffice.org$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
done &&\
@@ -2979,8 +2984,8 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo3.0.0~)"
- dh_makeshlibs -n -pure -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo3.0.0~)"
+ dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst awk '{ print $$2 }'))"
dh_installdeb -s
ifeq "$(USE_SYSTEM_ICU)" "n"
cat debian/shlibs.override.icu >> debian/shlibs.local
Reply to: