[ooo-build-commit] 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 0c75f4b45a2b543670f5f4553804c7f62dcac062
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 23 22:31:38 2009 +0200

    fix build without l10n
    
    * patches/dev300/apply: move l10n-build-only-selected-langs.diff to
      LocalizeFixes

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4f82c0f..c374e76 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1292,9 +1292,6 @@ installer-strip-optional.diff, i#48814, pmladek
 # Workaround for compile failure with glibc 2.4's langinfo.h
 i18nutil-glibc-braindamage-workaround.diff, brosenk
 
-# pack only selected languages in the l10n module
-l10n-build-only-selected-langs.diff, i#106185, pmladek
-
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
 sdk-gid-module-name.diff, pmladek, i#64802
@@ -2840,6 +2837,9 @@ sw-source-filter-xml-xmltbli-uninitializedvalue.diff, fridrich
 # Fix Spanish translation of the autofilter menu; thanks to Eduardo Moreno
 sc-autofilter-l10n-es.diff, i#103840, pmladek
 
+# pack only selected languages in the l10n module
+l10n-build-only-selected-langs.diff, i#106185, pmladek
+
 [ UnstableLibwpd ]
 config_office-testing.diff
 libwpd-testing.diff
commit c116fff3df6981fbdcf6720f509f904d7e50ae8d
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 23 20:58:30 2009 +0200

    apply split-icons-search-usr-share*.diff also for DebianBaseOnly

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 35888f7..4f82c0f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2131,16 +2131,16 @@ kde4-kab.diff
 # show only the installed icon themes in Tools/Options.../OpenOffice.org/View
 optional-icon-themes.diff, i#105062, bnc#529404, pmladek
 
-[ NovellOnlyUnix and OptionalIconThemes ]
 # search also /usr/share for icons
 # it is a temporary hack; we should do more clean FHS compliant installation
 # we need a good plan before, though ;-)
+[ NovellOnlyUnix and OptionalIconThemes ]
+split-icons-search-usr-share-and-optional-icons.diff, n#296502, pmladek
+[ DebianBaseOnly and OptionalIconThemes ]
 split-icons-search-usr-share-and-optional-icons.diff, n#296502, pmladek
-
 [ NovellOnlyUnix and not OptionalIconThemes ]
-# search also /usr/share for icons
-# it is a temporary hack; we should do more clean FHS compliant installation
-# we need a good plan before, though ;-)
+split-icons-search-usr-share.diff, n#296502, pmladek
+[ DebianBaseOnly and not OptionalIconThemes ]
 split-icons-search-usr-share.diff, n#296502, pmladek
 
 [ ArkOnly ]