------------------------------------------------------------
revno: 2128
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-10-08 10:01:46 +0200
message:
update to current git
removed:
patches/fix-cli_ure-build.diff
added:
patches/splash-progressbarcolor.diff
modified:
changelog
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-10-04 17:54:30 +0000
+++ b/changelog 2010-10-08 08:01:46 +0000
@@ -1,7 +1,7 @@
-libreoffice (1:3.3.0~3.2.99.2~20100930-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~3.2.99.2~20101007-1) UNRELEASED; urgency=low
* welcome, LibreOffice
- includes with OpenOffice.org 3.3.0 release branch milestone 7, so:
+ includes OpenOffice.org 3.3.0 release branch milestone 9, so:
- fixes hebrew text in sheet tabs when using system fonts
(closes: #433231)
@@ -56,7 +56,7 @@
* debian/control.in, debian/rules: stop building industrial package
* debian/scripts/fix_bmp_rgb: remove
- -- Rene Engelhard <r...@debian.org> Mon, 04 Oct 2010 16:56:49 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 07 Oct 2010 18:39:27 +0200
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== removed file 'patches/fix-cli_ure-build.diff'
--- a/patches/fix-cli_ure-build.diff 2010-10-04 01:33:34 +0000
+++ b/patches/fix-cli_ure-build.diff 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
----
libreoffice-3.3.0/build-3-2-99-2/patches/mono/mono-component-support-old.diff
2010-10-04 02:44:54.000000000 +0200
-+++ libreoffice-3.3.0/build-3-2-99-2/patches/mono/mono-component-support.diff
2010-10-04 02:45:21.000000000 +0200
-@@ -504,6 +504,12 @@
- index 1c21fd5..6b65166 100644
- --- cli_ure/prj/build.lst
- +++ cli_ure/prj/build.lst
-+@@ -1,4 +1,4 @@
-+-ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges
NULL
-++ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges
tools NULL
-+ ure cli_ure usr1 - all
ure_mkout NULL
-+ ure cli_ure\inc nmake - all
ure_inc NULL
-+ ure cli_ure\version nmake - all
ure_source_version ure_inc NULL
- @@ -10,5 +10,6 @@ ure cli_ure\unotypes nmake
- all ure_unotypes ure_source_version
- ure cli_ure\source\ure nmake - all
ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source
ure_source_basetypes ure_unotypes ure_inc NULL
- ure cli_ure\source\uno_bridge nmake - w,vc7
ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc
NULL
=== modified file 'patches/series'
--- a/patches/series 2010-10-04 01:33:34 +0000
+++ b/patches/series 2010-10-08 08:01:46 +0000
@@ -1,4 +1,4 @@
installer-globals-max-1-regcomp.diff
#reduce-height-on-dialogs-for-netbooks.diff
#shift-translations.diff
-fix-cli_ure-build.diff
+splash-progressbarcolor.diff
=== added file 'patches/splash-progressbarcolor.diff'
--- a/patches/splash-progressbarcolor.diff 1970-01-01 00:00:00 +0000
+++ b/patches/splash-progressbarcolor.diff 2010-10-08 08:01:46 +0000
@@ -0,0 +1,29 @@
+--- /dev/null 2010-09-28 02:28:57.560060918 +0200
++++ libreoffice-3.3.0/build-3-2-99-2/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
++@@ -25,7 +25,7 @@
++ POOLPRODUCT 1
++ REGISTRATION_HOST
https://registration.documentfoundation.org/RegistrationWeb
++ REGISTRATIONURL
http://survey.documentfoundation.org/user/index.php
++- PROGRESSBARCOLOR 126,170,23
+++ PROGRESSBARCOLOR 215,7,81
++ PROGRESSSIZE 320,7
++ PROGRESSPOSITION 185,206
++ PROGRESSFRAMECOLOR 207,208,211
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 485e60d..536caec 100644
+--- libreoffice-3.3.0/build-3-2-99-2/patches/dev300/apply
++++ libreoffice-3.3.0/build-3-2-99-2/patches/dev300/apply
+@@ -618,6 +618,10 @@ SectionOwner => Slackware
+ pushfont-psstream.diff
+ scp2-user-config-ooo3.diff
+
++[ DebianBaseOnly ]
++# fix the splash progressbar colors
++debian-splash.diff
++
+ [ DroplineGNOMEOnly ]
+ SectionOwner => DropLine
+
=== modified file 'rules'
--- a/rules 2010-10-04 17:54:30 +0000
+++ b/rules 2010-10-08 08:01:46 +0000
@@ -2150,7 +2150,7 @@
# remove those for safety in case the languages might change on
# testbuilds. then the /*/ in dh_installdocs in binary-* won't work
# anymore (different dirs)
- rm -rf $(SOURCE_TREE)/instsetoo_native/util/OpenOffice
+ rm -rf $(SOURCE_TREE)/instsetoo_native/util/LibreOffice
# install OpenOffice.org.
# somehow in the installer LD_LIBRARY_PATH doesn't contain
@@ -3565,7 +3565,7 @@
done
dh_installdocs -s -A debian/README.Debian \
-
$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
+
$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/00/README \
$(OOO_BUILD_TREE)/NEWS
cp debian/ure.templates.in debian/ure.templates
dh_installdebconf -s
@@ -3796,7 +3796,7 @@
perl -pi -e 's,html/,html /,g'
debian/openoffice.org-dev-doc.doc-base.udk-common-ref
endif
dh_installdocs -i -A debian/README.Debian \
-
$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
+
$(SOURCE_TREE)/instsetoo_native/util/LibreOffice/replace_file/*/00/README \
$(OOO_BUILD_TREE)/NEWS
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "o*.1"`; do \
