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

[Tor Lillqvist]

 patches/dev300/apply                                  |    5 ++++-
 patches/dev300/buildfix-instsetoo_native-archive.diff |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 395b0e199b0beabc392322d97ed951eec62ddc59
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 7 14:52:02 2010 +0300

    Make buildfix-instsetoo_native-archive.diff apply again

diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff b/patches/dev300/buildfix-instsetoo_native-archive.diff
index 619429a..ddf79e0 100644
--- a/patches/dev300/buildfix-instsetoo_native-archive.diff
+++ b/patches/dev300/buildfix-instsetoo_native-archive.diff
@@ -1,7 +1,7 @@
 --- instsetoo_native/util/makefile.mk	2010-06-25 15:19:33.000000000 +0100
 +++ instsetoo_native/util/makefile.mk	2010-06-25 15:36:17.000000000 +0100
 @@ -213,32 +213,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
-     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
  
  $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
 -openofficewithjre_%{$(PKGFORMAT:^".")} :
@@ -12,7 +12,7 @@
 -openofficedev_%{$(PKGFORMAT:^".")} :
 +openofficedev_%{$(PKGFORMAT:^".") .archive} :
      $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
  
  $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 -ooolanguagepack_%{$(PKGFORMAT:^".")} :
commit 929e89a6acce13d8f68042cab5d0e6213e007434
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 7 14:50:04 2010 +0300

    Skip redirect-extensions.diff for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a6f04ba..586c2a3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -285,7 +285,10 @@ uses-vfs.diff, i#43504, michael
 buildfix-x86-64-visibility-workaround.diff
 
 # re-direct to plugins via http://extensions.go-oo.org/
-redirect-extensions.diff
+
+# do we want this any more? and in any case, needs mangling
+# as the "upstream" now uses documentfoundation.org
+# redirect-extensions.diff
 
 [ Fixes ]
 # correctly set table row height during ppt import