------------------------------------------------------------ revno: 1680 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Tue 2009-09-29 08:46:02 +0200 message: update ooo-build and close #548767. fix debuild -i. Fix da GSI and close #548608 modified: changelog rules
=== modified file 'changelog' --- a/changelog 2009-09-24 16:12:09 +0000 +++ b/changelog 2009-09-29 06:46:02 +0000 @@ -3,7 +3,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. @@ -14,9 +15,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 <r...@debian.org> Wed, 23 Sep 2009 19:23:02 +0200 + -- Rene Engelhard <r...@debian.org> Tue, 29 Sep 2009 08:37:49 +0200 openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'rules' --- a/rules 2009-09-24 16:15:50 +0000 +++ b/rules 2009-09-29 06:46:02 +0000 @@ -1251,6 +1251,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 \ @@ -1669,6 +1671,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