./packages/openofficeorg/3.3.0/experimental r2073: update to ooo-build 4fff9df877047fd183123e3bbe50fb91b80eb5f6 with build fix
------------------------------------------------------------
revno: 2073
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2010-08-01 17:48:59 -0400
message:
update to ooo-build 4fff9df877047fd183123e3bbe50fb91b80eb5f6 with build fix
modified:
changelog
patches/installer-globals-max-1-regcomp.diff
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-07-31 20:34:22 +0000
+++ b/changelog 2010-08-01 21:48:59 +0000
@@ -5,7 +5,8 @@
(closes: #433231)
* ooo-build:
- - back to master/git for now: 554181ce1ae40666b629fc472f7e4532bad3999e
+ - back to master
+ - use git (for now) again: 4fff9df877047fd183123e3bbe50fb91b80eb5f6
* debian/rules:
- add and rework target(s) for new external sources handling upstream
@@ -38,7 +39,7 @@
so that we don't "loose" icons because of not-matching basis. Thanks
Michael Tokarev for pointing this out.
- -- Rene Engelhard <rene@debian.org> Sat, 31 Jul 2010 16:29:40 -0400
+ -- Rene Engelhard <rene@debian.org> Sun, 01 Aug 2010 17:44:44 -0400
openoffice.org (1:3.2.1-5) unstable; urgency=medium
=== modified file 'patches/installer-globals-max-1-regcomp.diff'
--- a/patches/installer-globals-max-1-regcomp.diff 2010-07-31 20:25:23 +0000
+++ b/patches/installer-globals-max-1-regcomp.diff 2010-08-01 21:48:59 +0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++ openoffice.org-3.3.0/ooo-build-554181ce1ae40666b629fc472f7e4532bad3999e/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
++++ openoffice.org-3.3.0/ooo-build-4fff9df877047fd183123e3bbe50fb91b80eb5f6/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
@@ -0,0 +1,14 @@
+diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
+--- solenv/bin/modules/installer/globals.pm
@@ -17,8 +17,8 @@
+ $fix_number_of_cab_files = 1;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..5f1c32a 100644
---- openoffice.org-3.3.0/ooo-build-554181ce1ae40666b629fc472f7e4532bad3999e/patches/dev300/apply
-+++ openoffice.org-3.3.0/ooo-build-554181ce1ae40666b629fc472f7e4532bad3999e/patches/dev300/apply
+--- openoffice.org-3.3.0/ooo-build-4fff9df877047fd183123e3bbe50fb91b80eb5f6/patches/dev300/apply
++++ openoffice.org-3.3.0/ooo-build-4fff9df877047fd183123e3bbe50fb91b80eb5f6/patches/dev300/apply
@@ -307,6 +307,10 @@ gcc-HelpLinker.diff
# configmgr paths are not yet existing then
speed-sal-fewer-lstats.diff, i#89730, jholesov
=== modified file 'rules'
--- a/rules 2010-08-01 20:50:58 +0000
+++ b/rules 2010-08-01 21:48:59 +0000
@@ -73,7 +73,7 @@
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-3
-OOO_BUILD_VERSION=554181ce1ae40666b629fc472f7e4532bad3999e
+OOO_BUILD_VERSION=4fff9df877047fd183123e3bbe50fb91b80eb5f6
OOO_BUILD_TAG=
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
=== modified file 'source/components'
--- a/source/components 2010-07-01 13:31:37 +0000
+++ b/source/components 2010-08-01 21:48:59 +0000
@@ -1,4 +1,4 @@
ext-sources
-ooo-build-0e5cd4ee71f4892e8044cdb49572647099a81faf
-ext-sources-ooo-build-0e5cd4ee71f4892e8044cdb49572647099a81faf
+ooo-build-4fff9df877047fd183123e3bbe50fb91b80eb5f6
+ext-sources-ooo-build-4fff9df877047fd183123e3bbe50fb91b80eb5f6
translation-updates-20100529
Reply to: