------------------------------------------------------------
revno: 2224
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Wed 2010-12-01 20:22:12 +0100
message:
update to LIBREOFFICE_3_3_0_1 tag
modified:
changelog
patches/buildfix-patches.diff
patches/hack-no-rm-fr-of-smoketest-userconfig.diff
patches/installer-globals-max-1-regcomp.diff
patches/splash-progressbarcolor.diff
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-11-30 18:25:22 +0000
+++ b/changelog 2010-12-01 19:22:12 +0000
@@ -1,6 +1,6 @@
-libreoffice (1:3.3.0~rc1~20101130-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~rc1-1) UNRELEASED; urgency=low
- * update to git (20101130)
+ * LibreOffice 3.3.0 rc1
* debian/patches/splash-progressbarcolor.diff: update for new artwork
* debian/patches/buildfix-patches.diff: remove
@@ -26,7 +26,7 @@
the various upstream changelogs
* debian/control.in: remove Breaks on -sdbc-postgresql again
- -- Rene Engelhard <r...@debian.org> Tue, 30 Nov 2010 18:23:17 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 01 Dec 2010 19:33:55 +0100
libreoffice (1:3.3.0~beta3-2) experimental; urgency=low
=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff 2010-11-30 18:25:22 +0000
+++ b/patches/buildfix-patches.diff 2010-12-01 19:22:12 +0000
@@ -1,5 +1,5 @@
---- libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply-old
2010-10-18 09:11:18.000000000 +0200
-+++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
2010-10-18 09:11:30.000000000 +0200
+--- libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply-old
2010-10-18 09:11:18.000000000 +0200
++++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
2010-10-18 09:11:30.000000000 +0200
@@ -1878,7 +1878,7 @@
[ Fixes ]
fix-ppt-linespacing-import-export.diff, n#355302, rodo
=== modified file 'patches/hack-no-rm-fr-of-smoketest-userconfig.diff'
--- a/patches/hack-no-rm-fr-of-smoketest-userconfig.diff 2010-11-26
20:04:28 +0000
+++ b/patches/hack-no-rm-fr-of-smoketest-userconfig.diff 2010-12-01
19:22:12 +0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-10-31 21:59:47.283126105 +0100
-+++
libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/hack-no-rm-fr-of-smoketest-userconfig.diff
2010-11-09 21:21:23.000000000 +0100
++++
libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/hack-no-rm-fr-of-smoketest-userconfig.diff
2010-11-09 21:21:23.000000000 +0100
@@ -0,0 +1,39 @@
+diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
+index 80de446..3a7be7f 100644
@@ -40,8 +40,8 @@
+ .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
+ $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
+ javatest : $(MISC)/$(TARGET)/installation.flag
---- libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply-old
2010-11-10 11:46:58.000000000 +0100
-+++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
2010-11-10 11:47:21.000000000 +0100
+--- libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply-old
2010-11-10 11:46:58.000000000 +0100
++++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
2010-11-10 11:47:21.000000000 +0100
@@ -2411,3 +2411,6 @@
sd_effects_styles.diff, pixie
symbols-20-august.diff, i#11167, jopsen
=== modified file 'patches/installer-globals-max-1-regcomp.diff'
--- a/patches/installer-globals-max-1-regcomp.diff 2010-11-11 18:33:58
+0000
+++ b/patches/installer-globals-max-1-regcomp.diff 2010-12-01 19:22:12
+0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
-+++
openoffice.org-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/installer-globals-max-1-regcomp.diff
2010-06-11 00:39:33.000000000 +0200
++++
openoffice.org-3.3.0/libreoffice-build-3-3-0-1/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/libreoffice-build-3-2-99-3/patches/dev300/apply
-+++ openoffice.org-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
+--- openoffice.org-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
++++ openoffice.org-3.3.0/libreoffice-build-3-3-0-1/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 'patches/splash-progressbarcolor.diff'
--- a/patches/splash-progressbarcolor.diff 2010-11-30 09:08:48 +0000
+++ b/patches/splash-progressbarcolor.diff 2010-12-01 19:22:12 +0000
@@ -1,5 +1,5 @@
--- /dev/null 2010-09-28 02:28:57.560060918 +0200
-+++
libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/debian-splash.diff
2010-10-07 19:19:42.000000000 +0200
++++
libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/debian-splash.diff
2010-10-07 19:19:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- instsetoo_native/util/openoffice.lst-old 2008-08-06 00:03:46.000000000
+0200
++++ instsetoo_native/util/openoffice.lst 2008-08-06 00:04:01.000000000
+0200
@@ -14,8 +14,8 @@
+ PROGRESSFRAMECOLOR 207,208,211
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 485e60d..536caec 100644
---- libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
-+++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/dev300/apply
+--- libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
++++ libreoffice-3.3.0/libreoffice-build-3-3-0-1/patches/dev300/apply
@@ -572,6 +572,10 @@
pushfont-psstream.diff
scp2-user-config-ooo3.diff
=== modified file 'rules'
--- a/rules 2010-11-30 16:12:50 +0000
+++ b/rules 2010-12-01 19:22:12 +0000
@@ -72,11 +72,11 @@
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=libreoffice-3-3
-OOO_BUILD_VERSION=3.2.99.3
+OOO_BUILD_VERSION=3.3.0.1
# in ooo-build releases the same as OOO_BUILD_VERSION
#OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
-OOO_BUILD_TARBALL_VERSION=3.2.99.3
-OOO_BUILD_TAG=LIBREOFFICE_3_2_99_3
+OOO_BUILD_TARBALL_VERSION=3.3.0.1
+OOO_BUILD_TAG=LIBREOFFICE_3_3_0_1
OOO_BUILD_TREE=libreoffice-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e
's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
STAMP_DIR=debian/stampdir
=== modified file 'source/components'
--- a/source/components 2010-11-11 18:33:58 +0000
+++ b/source/components 2010-12-01 19:22:12 +0000
@@ -1,4 +1,4 @@
ext-sources
-libreoffice-build-3-2-99-3
-ext-sources-libreoffice-build-3-2-99-3
+libreoffice-build-3-3-0-1
+ext-sources-libreoffice-build-3-3-0-1
translation-updates-20100529
