[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - bin/piece src/sofficerc-upstream

[Petr Mladek]

 bin/piece/file-list-help |    2 ++
 src/sofficerc-upstream   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 63ee773e6a964b5f5ee286d435b3ac09cbcdfae2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Dec 16 12:42:15 2010 +0100

    split build fix: remove more duplicated files after the help installation

diff --git a/bin/piece/file-list-help b/bin/piece/file-list-help
index 52811c0..c1e62a8 100755
--- a/bin/piece/file-list-help
+++ b/bin/piece/file-list-help
@@ -21,7 +21,9 @@ rm -rf $DESTDIR$OO_SOLVERDIR/pck/*.zip
 
 # prune redundant files the scp2 likes to make for us
 remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link"
 remove_file "files-$piece.txt" "$OO_INSTDIR/share/extensions/package.txt"
+remove_file "files-$piece.txt" "$OO_INSTDIR/LICENSE.odt"
 
 # move the stuff to /usr/share when enabled
 if test "$OOO_BUILD_NOARCH" = 'YES' ; then
commit db6ecfc50b80fa3778babd184c48d2369adc87c2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Dec 16 12:41:36 2010 +0100

    split build fix: sync sofficerc-upstream with sources

diff --git a/src/sofficerc-upstream b/src/sofficerc-upstream
index 9378192..d1b9331 100644
--- a/src/sofficerc-upstream
+++ b/src/sofficerc-upstream
@@ -4,6 +4,6 @@ Logo=1
 NativeProgress=true
 ProgressBarColor=126,170,23
 ProgressFrameColor=207,208,211
-ProgressPosition=165,186
-ProgressSize=320,7
+ProgressPosition=164,225
+ProgressSize=319,10
 URE_BOOTSTRAP=${ORIGIN}/fundamentalrc