./packages/openofficeorg/3.2/experimental r1657: merge
------------------------------------------------------------
revno: 1657 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-09-29 08:58:27 +0200
message:
merge
added:
openoffice.org-evolution.script.bug.in
openoffice.org-filter-binfilter.script.bug.in
openoffice.org-mysql-connector.script.bug.in
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-09-29 06:57:53 +0000
+++ b/changelog 2009-09-29 06:58:27 +0000
@@ -51,7 +51,8 @@
* The "Goodbye sparc!" release. :-(
* ooo-build:
- - update (dfae7670722533f98455aa7f96d8709f79c72d84)
+ - update (a96dab3afc2d47da4cabf2890e3c8215187e96a6)
+ - Fixed range selection for RTL languages. (closes: #548767)
* merge from Ubuntu:
- Add support to turn off building on sparc.
@@ -62,9 +63,11 @@
- enable mysql-connector
- use expr instead of bc so we get a proper kdelibsX-dev also with bc
not installed
+ - remove bogus (.*på engelsk) from GSI_da to fix some functions
+ (closes: #548608)
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
- -- Rene Engelhard <rene@debian.org> Wed, 23 Sep 2009 19:23:02 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 29 Sep 2009 08:37:49 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== added file 'openoffice.org-evolution.script.bug.in'
--- a/openoffice.org-evolution.script.bug.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-evolution.script.bug.in 2009-09-29 06:42:02 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/openoffice/program/unopkg list --shared org.openoffice.legacy.mailmerge.py >&3
=== added file 'openoffice.org-filter-binfilter.script.bug.in'
--- a/openoffice.org-filter-binfilter.script.bug.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-filter-binfilter.script.bug.in 2009-09-29 06:42:02 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/ure/bin/regview /var/lib/openoffice/basis3.1/program/services.rdb | grep bf_ >&3
=== added file 'openoffice.org-mysql-connector.script.bug.in'
--- a/openoffice.org-mysql-connector.script.bug.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.script.bug.in 2009-09-29 06:42:02 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/ure/bin/regview /var/lib/openoffice/basis3.1/program/services.rdb | grep evo > &3
=== modified file 'rules'
--- a/rules 2009-09-29 06:57:53 +0000
+++ b/rules 2009-09-29 06:58:27 +0000
@@ -1267,6 +1267,8 @@
src/layout/ooo_custom_images/tango/res/commandimagelist/*.png \
src/icons/*.png \
src/icons/tango/*.png \
+ src/acor_ru-RU.dat \
+ src/acor_sk-SK.dat \
templates/*.ott \
test/Lwp/*.lwp \
test/Lwp/*.png \
@@ -1691,6 +1693,11 @@
> $$TMP && mv $$TMP ooo-build/src/GSI_he.sdf ; \
fi
endif
+ ifeq (da,$(findstring da,$(LANGPACKISOS)))
+ if [ -f ooo-build/src/GSI_da.sdf ]; then \
+ perl -pi -e 's/\s\(.*på engelsk\)//' ooo-build/src/GSI_da.sdf; \
+ fi
+ endif
endif
endif
Reply to: