This commit was manufactured by cvs2svn to create tagDEBIAN-2_0_1-4BPO1

'DEBIAN-2_0_1-4BPO1'.

41 files changed, 1126 insertions, 253 deletions

diff --git a/Makefile.shared b/Makefile.shared
index 64f1a6464..316a2e5df 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -32,8 +32,15 @@ $(OOBUILDDIR)/unpack :
 artwork.install : $(STAMP_DIR)/artwork.install
 $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \
 			      $(STAMP_DIR)/prebuild \
-			      $(top_srcdir)/src/*.png $(top_srcdir)/src/*.bmp
+			      $(wildcard $(top_srcdir)/src/*.png) \
+			      $(wildcard $(top_srcdir)/src/*.bmp)
 	mkdir -p $(OOBUILDDIR)/svx/res
+	mkdir -p $(OOBUILDDIR)/instsetoo_native/res
+	cp $(top_srcdir)/src/ooobitmap_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis installer images to copy"
+	cp $(top_srcdir)/src/ooobanner_*.bmp $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no nsis banner images to copy"
+	cp $(top_srcdir)/src/ooosetup_*.ico $(OOBUILDDIR)/setup_native/source/win32/nsis/ || echo "no installer icon to copy"
+	cp $(top_srcdir)/src/nologoinstall_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer sidebar images to copy"
+	cp $(top_srcdir)/src/banner_*.bmp $(OOBUILDDIR)/instsetoo_native/res/ || echo "no installer banner images to copy"
 	cp $(top_srcdir)/src/open*_*.bmp $(OOBUILDDIR)/svx/res/ || echo "no intro images to copy"
 	cp $(top_srcdir)/src/open*_*.png $(OOBUILDDIR)/default_images/svx/res/ || echo "no about images to copy"
 	cp $(top_srcdir)/src/*-team.png $(OOBUILDDIR)/default_images/sw/res/ || echo "no team images to copy"
@@ -45,7 +52,7 @@ patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply
 $(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
 			   $(top_srcdir)/patches/*/*.diff \
 			   $(APPLY_DIR)/apply
-	cp -f $(SRCDIR)/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd"
+	cp -af $(SRCDIR)/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd"
 	if test "z$(BUILD_WIN32)" != "z"; then \
 	    cp -af $(BUILDDIR)/x86/* $(OOBUILDDIR)/external/dbghelp || true; \
 	    cp -af $(BUILDDIR)/*.dll $(OOBUILDDIR)/external/unicows || true; \
diff --git a/bin/build-galleries b/bin/build-galleries
index 9f08c371d..18069a517 100755
--- a/bin/build-galleries
+++ b/bin/build-galleries
@@ -34,6 +34,15 @@ if (! test -e $GAL_BIN); then
     exit 1;
 fi
 
+echo -n "checking whether find supports the option -L... "
+if find -L / -maxdepth 0 >/dev/null 2>&1 ; then
+    FIND_SUPPORT_SYMLINKS="-L"
+    echo "yes"
+else
+    FIND_SUPPORT_SYMLINKS=
+    echo "no"
+fi
+
 if test "z$OPENCLIPART_VER" != "z" ; then
 
     echo "Generating .png files..."
@@ -77,17 +86,41 @@ if test "z$OPENCLIPART_VER" != "z" ; then
 
 fi
 
-if test ! -e /tmp/.X0-lock && which Xvfb >/dev/null 2>&1 ; then
-    # X server probably is not available, try to use Xvfb
-    export DISPLAY=":98"
-    Xvfb -ac $DISPLAY &
-    trap "kill $! || true" EXIT
-    # let server to start
-    sleep 10
+XDISPLAY=98
+while /bin/true; do 
+	if [ ! -f /tmp/.X$XDISPLAY-lock ]; then
+		sleep 2s
+		/usr/X11R6/bin/Xvfb -ac :$XDISPLAY >& /dev/null &
+		trap "kill $! > /dev/null 2>&1 || true" EXIT
+		# let server to start
+		sleep 10s 
+		if [ -f /tmp/.X$XDISPLAY-lock ]; then
+			break;
+		fi
+	fi
+	XDISPLAY=$(($XDISPLAY+1))
+done
+export DISPLAY=":$XDISPLAY"
+echo "Using DISPLAY="$DISPLAY
+echo "Xvfb processes:"
+ps -ef | grep -i Xvfb
+
+# clean a previous gallery installation in DESTDIR
+if test "z$OODESTDIR" != "z" ; then
+    gal_idx=$GAL_NUMBER_FROM
+
+    while test -f $GAL_DIR/sg$gal_idx.thm -o \
+		-f $GAL_DIR/sg$gal_idx.sdg -o \
+		-f $GAL_DIR/sg$gal_idx.sdv; do
+			rm -f $GAL_DIR/sg$gal_idx.thm \
+			      $GAL_DIR/sg$gal_idx.sdg \
+			      $GAL_DIR/sg$gal_idx.sdv
+	gal_idx=$(($gal_idx + 1))
+    done
 fi
 
 mkdir -p "$GAL_DIR"
-for dir in `find $OPENCLIPART_DIR -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C sort` ; do
+for dir in `find $FIND_SUPPORT_SYMLINKS $OPENCLIPART_DIR -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C sort` ; do
     # get the gallery name from the directory name
     # and make the first character uppercase
     gal_name=${dir##*/}
@@ -99,19 +132,24 @@ for dir in `find $OPENCLIPART_DIR -mindepth 1 -maxdepth 1 -type d | LC_CTYPE=C s
 
     echo "Doing gallery $gal_name..."
     # xargs is necessary because I 
-    find $dir -name "*.png" | { xargs $GAL_BIN --name "$gal_name" --path "$GAL_DIR" --destdir "$OODESTDIR" --number-from "$GAL_NUMBER_FROM" || exit 1; }
+    find $dir -name "*.png" -print0 | { xargs -0 $GAL_BIN --name "$gal_name" --path "$GAL_DIR" --destdir "$OODESTDIR" --number-from "$GAL_NUMBER_FROM" || exit 1; }
 done
 
 # guess the filelist
 if test "z$OODESTDIR" != "z" ; then
     gal_num=$GAL_NUMBER_FROM
     rm -f $BUILDDIR/galleries.txt
-    while test -f $GAL_DIR/sg$gal_num.sdg -a \
-               -f $GAL_DIR/sg$gal_num.sdv -a \
-	       -f $GAL_DIR/sg$gal_num.thm ; do
-	echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdg >>$BUILDDIR/galleries.txt
-	echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdv >>$BUILDDIR/galleries.txt
-	echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.thm >>$BUILDDIR/galleries.txt
+
+    while test -f $GAL_DIR/sg$gal_num.thm; do
+	if [ -e $GAL_DIR/sg$gal_num.sdg -a -e $GAL_DIR/sg$gal_num.sdv ]; then
+		echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdg >>$BUILDDIR/galleries.txt
+		echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.sdv >>$BUILDDIR/galleries.txt
+		echo ${GAL_DIR#$OODESTDIR}/sg$gal_num.thm >>$BUILDDIR/galleries.txt
+	else
+		# remove incomplete galleries (exists .thm but not .sdg)
+		rm -f $GAL_DIR/sg$gal_num.sdv \
+		      $GAL_DIR/sg$gal_num.thm
+	fi
 	gal_num=$(($gal_num + 1))
     done
 fi
diff --git a/bin/build-ooo b/bin/build-ooo
index a09af552c..cd8578a8f 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -13,29 +13,36 @@ if test "z$BUILD_WIN32" = "z"; then
     fi
 fi
 
-# configure
-
-#  dmake security patch
-cd $OOBUILDDIR/dmake
-autoconf || exit 1;
+if test "z$BUILD_FROM" = "z"; then
+    # configure
+
+    #  dmake security patch
+    cd $OOBUILDDIR/dmake
+    autoconf || exit 1;
+
+    #  main configure
+    cd $OOBUILDDIR/config_office
+    rm -f config.cache
+    echo "configuring ...";
+    autoconf || exit 1;
+
+    # If we are forcing gcc33, make sure configure knows
+    if test "z$FORCE_GCC33" = "zYES"; then
+    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CFLAGS= CXXFLAGS= CC=gcc33 CXX=g++33"
+    fi
 
-#  main configure
-cd $OOBUILDDIR/config_office
-rm -f config.cache
-echo "configuring ...";
-autoconf || exit 1;
+    echo "Env for configure:"
+    set
+    echo "Env for configure ends"
 
-# If we are forcing gcc33, make sure configure knows
-if test "z$FORCE_GCC33" = "zYES"; then
-CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CFLAGS= CXXFLAGS= CC=gcc33 CXX=g++33"
+    eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+else
+    if ! test -d "$OOBUILDDIR/$BUILD_FROM"; then
+        echo "BUILD_FROM is set to non-existent directory: $BUILD_FROM"
+        exit 1;
+    fi
 fi
 
-echo "Env for configure:"
-set
-echo "Env for configure ends"
-
-eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
-
 # Unfortunately, on when forcing gcc33 on x86, RPM attempts to
 # inject its %{optflags} everywhere.  Since gcc33 doesn't support
 # -mtune, override that here
@@ -54,8 +61,13 @@ fi
 
 # Final build preparation
 
+EXTRA_BUILD_FLAGS=
+EXTRA_DMAKE_FLAGS=
+
 # tcsh sucks great rocks, and refuses to re-direct it's output otherwise
 export TERM=
+# work around tcsh bug bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
+unset LS_COLORS
 # Many Java files have 8bit char-set comments, javac barfs on them in utf8 locales
 export LANG="C";
 
@@ -99,18 +111,21 @@ if test "z$BUILD_WIN32" != "zyes"; then
 fi
 bison --version
 flex --version
-echo 'Bootstrapping'
-./bootstrap || ./bootstrap || ./bootstrap || exit 1;
+if test "z$BUILD_FROM" = "z"; then
+    echo 'Bootstrapping'
+    ./bootstrap || ./bootstrap || ./bootstrap || exit 1;
+    EXTRA_BUILD_FLAGS="--all"
+else
+    EXTRA_BUILD_FLAGS="--from $BUILD_FROM $EXTRA_BUILD_FLAGS"
+fi
 # parallel build setting
-EXTRA_BUILD_FLAGS=
 if test "$BUILD_NCPUS" -gt 1; then
-    EXTRA_BUILD_FLAGS="-P$BUILD_NCPUS"
+    EXTRA_BUILD_FLAGS="-P$BUILD_NCPUS $EXTRA_BUILD_FLAGS"
 fi
 if test "z$BUILD_WIN32" = "z"; then
     EXTRA_BUILD_FLAGS="--dlv_switch link $EXTRA_BUILD_FLAGS"
 fi
 
-EXTRA_DMAKE_FLAGS=
 if test "$ENABLE_ICECREAM" = "yes" -a "$ICECREAM_JOBS" -gt 1; then
     EXTRA_DMAKE_FLAGS="-- -P$ICECREAM_JOBS"
 fi
@@ -170,7 +185,8 @@ fi
 
 echo 'Commencing main build'
 cd $OOBUILDDIR/instsetoo_native || exit 1;
-perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+echo "build.pl $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS"
+perl $SOLARENV/bin/build.pl $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
 OOO_REBUILD_NEEDED="no"
     
 echo "Build succeeded ...!"
diff --git a/bin/ooinstall b/bin/ooinstall
index f259f9048..d0427bae3 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -88,7 +88,8 @@ print "Setting up environment\n";
 for $a (keys %configure_vars) {
     $ENV{$a} = $configure_vars{$a};
 }
-$BUILD=8825;
+
+$BUILD=8990;
 $ENV{OUT} = "../$configure_vars{'INPATH'}";
 $ENV{LOCAL_OUT} = $ENV{OUT};
 $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
diff --git a/bin/oowintool b/bin/oowintool
index d645932dc..0e9ee5266 100755
--- a/bin/oowintool
+++ b/bin/oowintool
@@ -225,6 +225,9 @@ sub copy_dll($$$)
 
     copy ("$src/$fname", $dest) || die "copy failed: $!";
     chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
+    # equivalent of cp -a or touch -r, make sure times are preserved
+    @fstat = stat("$src/$fname");
+    utime($fstat[8], $fstat[9], "$dest/$fname");
 }
 
 sub msvc_find_version($)
diff --git a/bin/openoffice-xlate-lang b/bin/openoffice-xlate-lang
index ca4766515..c4fb187bc 100755
--- a/bin/openoffice-xlate-lang
+++ b/bin/openoffice-xlate-lang
@@ -133,7 +133,7 @@ __DATA__
 :st:southern_sotho
 :tn:tswana
 :br:breton
-:ga:galician
+:ga:gaelic
 :th:thai
 :hi-IN:hindi
 :bs-BA:bosnian
diff --git a/bin/package-ooo b/bin/package-ooo
index 9d98178b4..ffc55d616 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -467,6 +467,7 @@ else
 	for l in `echo $OOO_LANGS_LIST | sed -e s/en-US//`; do \
 		create_package_directory gid_Module_Root.$l		pkg/openoffice.org-l10n-$l; \
 		create_package_directory gid_Module_Langpack_Resource.$l	pkg/openoffice.org-l10n-$l; \
+		create_package_directory gid_Module_Langpack_Help.$l	pkg/openoffice.org-help-$l; \
 	done
 
 	# move_wrappers <directory_name> <name> [...]
diff --git a/bin/setup.in b/bin/setup.in
index 2ada13685..e240c0e40 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -33,14 +33,14 @@ SYSTEM_CAIRO=@SYSTEM_CAIRO@
 GLITZ_VER=@GLITZ_VER@
 HUNSPELL_UNO_SRC=@HUNSPELL_UNO_SRC@
 HUNSPELL_LIB_SRC=@HUNSPELL_LIB_SRC@
+AGFA_MONOTYPE_FONTS_SOURCE=@AGFA_MONOTYPE_FONTS_SOURCE@
 
 if test "z$BUILD_WIN32" != "z"; then
     CONFIGURE_OPTIONS="--with-lang=\"$OOO_LANGS\" --with-use-shell=tcsh \
 		       --without-gpc --enable-crashdump=no \
 		       --disable-directx --enable-build-mozilla \
-		       --disable-binfilter --without-myspell-dicts \
+		       --disable-binfilter \
 		       --with-ant-home=$BUILDDIR/apache-ant-1.6.5"
-
 else
     # We pull config options in from distro-specific config files, if present
     if test "z$DISTRO" != "z"; then
diff --git a/bin/unpack b/bin/unpack
index 656a17c1e..3c8e0c18b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -36,6 +36,19 @@ if test "z$SYSTEM_GCC" = "z"; then
     if test "z$BINUTILS_TARBALL" != "z"; then
 	check_tarball $BINUTILS_TARBALL
     fi
+
+    if test "x$DEJAVU_FONTS_VER" != "x"; then
+        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
+        DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
+        if test ! -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
+            echo "Installing DejaVu fonts"
+            mkdir -p $DEJAVU_FONTSDEST || exit 1;
+            cp -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
+            echo "done"
+        else
+            echo "Already have DejaVu fonts"
+        fi
+    fi
 fi
 check_tarball $OOO_TARBALL
 
@@ -71,6 +84,10 @@ fi
 
 echo "Unpacking OO.o build tree - [ go make some tea ] ..."
 tar $OOO_UNTAR_OPTIONS $SRCDIR/$OOO_TARBALL || exit 1
+if test -d ooa680-m1 -a ! -d OOO_2_0_1 ; then
+    echo "Linking rc5 to 2.0.1"
+    ln -sf ooa680-m1 OOO_2_0_1
+fi
 
 echo "Fixing unfortunate snafus"
 INDUSTRIAL_DIR=$OOBUILDDIR/ooo_custom_images/industrial/res/commandimagelist
@@ -234,6 +251,19 @@ if test "z$BUILD_WIN32" != "z"; then
             echo "Already have Agfa Monotype fonts"
         fi
     fi
+
+    if test "x$DEJAVU_FONTS_VER" != "x"; then
+        DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
+        DEJAVU_FONTSSRC=dejavu-ttf-$DEJAVU_FONTS_VER.tar.gz
+        if test ! -f $DEJAVU_FONTSDEST/$DEJAVU_FONTSSRC; then
+            echo "Installing DejaVu fonts"
+            mkdir -p $DEJAVU_FONTSDEST || exit 1;
+            cp -f $SRCDIR/$DEJAVU_FONTSSRC $DEJAVU_FONTSDEST || exit 1;
+            echo "done"
+        else
+            echo "Already have DejaVu fonts"
+        fi
+fi
 fi
 
 if test "z$SYSTEM_GCC" = "z"; then
diff --git a/desktop/.cvsignore b/desktop/.cvsignore
index d01c728b6..05a110b28 100644
--- a/desktop/.cvsignore
+++ b/desktop/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 *.desktop
+*.png.uu
diff --git a/distro-configs/Debian64.conf.in b/distro-configs/Debian64.conf.in
index b641ac0d5..5d724ebd0 100644
--- a/distro-configs/Debian64.conf.in
+++ b/distro-configs/Debian64.conf.in
@@ -2,7 +2,6 @@
 --enable-libsn
 --disable-fontooo
 --with-system-expat
---with-system-neon
 --with-system-nas
 --with-system-curl
 --with-system-sane-header
diff --git a/distro-configs/Mandriva.conf.in b/distro-configs/Mandriva.conf.in
index 7f0247559..bba9331fc 100644
--- a/distro-configs/Mandriva.conf.in
+++ b/distro-configs/Mandriva.conf.in
@@ -1,5 +1,4 @@
 --enable-gnome-vfs
---with-jdk-home=$JAVA_HOME
 --without-myspell-dicts
 --with-system-curl
 --with-system-expat
diff --git a/distro-configs/translate-org-za-win32.conf.in b/distro-configs/translate-org-za-win32.conf.in
new file mode 100755
index 000000000..42008a3f9
--- /dev/null
+++ b/distro-configs/translate-org-za-win32.conf.in
@@ -0,0 +1,4 @@
+--enable-libsn
+--disable-odk
+--with-dict=ENUS,ENZA,AFZA,TNZA,XHZA,ZUZA
+--with-dejavu-fonts
diff --git a/fonts/opens___.ttf b/fonts/opens___.ttf
index a3cb35646..46108b854 100644
--- a/fonts/opens___.ttf
+++ b/fonts/opens___.ttf
diff --git a/patches/src680/buildfix-longnames-54730.diff b/patches/src680/buildfix-longnames-54730.diff
new file mode 100644
index 000000000..f2062b76d
--- /dev/null
+++ b/patches/src680/buildfix-longnames-54730.diff
@@ -0,0 +1,58 @@
+--- solenv/bin/modules/installer/languages.pm.all_lang	2005-09-08 05:04:40.000000000 -0400
++++ solenv/bin/modules/installer/languages.pm	2005-10-23 09:33:18.000000000 -0400
+@@ -64,6 +64,12 @@
+ 		$installer::globals::unixmultipath = $installer::globals::languagelist;
+ 		$installer::globals::unixmultipath =~ s/\,/\_/g;	# hashes not allowed, comma to underline
+ 		$installer::globals::alllanguagesinproductarrayref = installer::converter::convert_stringlist_into_array(\$installer::globals::unixmultipath, "_");
++
++		$installer::globals::unixmultipath_orig = $installer::globals::unixmultipath;
++		if (length($installer::globals::unixmultipath) > 120) {
++			chomp(my $shorter = `echo $installer::globals::unixmultipath | md5sum | sed -e "s/  -//g"` );
++			$installer::globals::unixmultipath = $shorter;
++		}
+ 	}	
+ 	
+ 	while ($first =~ /^(\S+)\#(\S+?)$/)	# Minimal matching, to keep the order of languages
+--- solenv/bin/modules/installer/globals.pm.all_lang	2005-10-20 14:49:34.000000000 -0400
++++ solenv/bin/modules/installer/globals.pm	2005-10-23 09:15:28.000000000 -0400
+@@ -124,6 +124,7 @@
+ 	$addpackagelist = "";
+ 	$is_unix_multi = 0;
+ 	$unixmultipath = "";
++	$unixmultipath_orig = "";
+ 	$alllanguagesinproductarrayref = "";
+ 	$shiptestdirectory = "";
+ 	$makelinuxlinkrpm = 0;
+--- solenv/bin/make_installer.pl.all_lang	2005-10-20 14:49:34.000000000 -0400
++++ solenv/bin/make_installer.pl	2005-10-23 09:31:02.000000000 -0400
+@@ -515,13 +515,29 @@
+ 	else { $logminor = $installer::globals::minor; }
+ 
+ 	my $loglanguagestring = $$languagestringref;
+-	if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath; }
++	if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath_orig; }
++
++	my $loglanguagestring_orig = $loglanguagestring;
++	if (length($loglanguagestring) > 120) {
++	    chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/  -//g"`);
++	    $loglanguagestring = $shorter;
++	}
+ 
+ 	$installer::globals::logfilename = "log_" . $installer::globals::build . "_" . $logminor . "_" . $loglanguagestring . ".log";
+ 
+ 	if (( ! $installer::globals::is_unix_multi ) || ( $isfirstrun )) { $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator; }
+ 
+ 	installer::systemactions::create_directory($loggingdir);
++
++	if ($loglanguagestring ne $loglanguagestring_orig) {
++	    (my $dir = $loggingdir) =~ s!/$!!;
++	    open(my $F1, "> $dir.dir");
++	    open(my $F2, "> " . $loggingdir . $installer::globals::logfilename . '.file');
++	    my @s = map { "$_\n" } split('_', $loglanguagestring_orig);
++	    print $F1 @s;
++	    print $F2 @s;
++	}
++
+ 	$installer::globals::exitlog = $loggingdir;
+ 
+ 	##############################################################
diff --git a/patches/src680/cws-unxlngs04.diff b/patches/src680/cws-unxlngs04.diff
new file mode 100644
index 000000000..f183fd85f
--- /dev/null
+++ b/patches/src680/cws-unxlngs04.diff
@@ -0,0 +1,121 @@
+Index: bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.6.1
+diff -u -u -r1.8 -r1.8.6.1
+--- bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	7 Sep 2005 22:25:05 -0000	1.8
++++ bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	23 Sep 2005 11:40:28 -0000	1.8.6.1
+@@ -371,11 +371,13 @@
+  */
+ static void cpp_vtable_call()
+ {
+-	volatile sal_Int64 nRegReturn;
++	sal_Int64 nRegReturn;
+ 	int nFunctionIndex;
+ 	void** pCallStack;
+ 	int vTableOffset;
+ 
++void * pRegReturn = &nRegReturn;
++
+ 	__asm__( "st %%i0, %0\n\t"
+ 			"st %%i1, %1\n\t"
+  			"st %%i2, %2\n\t"
+@@ -394,41 +396,40 @@
+ 		case typelib_TypeClass_BYTE:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ldsb [%%l0], %%i0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_CHAR:
+ 		case typelib_TypeClass_SHORT:
+ 		case typelib_TypeClass_UNSIGNED_SHORT:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ldsh [%%l0], %%i0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_HYPER:
+ 		case typelib_TypeClass_UNSIGNED_HYPER:
+-
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ld [%%l0], %%i0\n\t"
+-					 "ld %1, %%l0\n\t"
++					 "add %%l0, 4, %%l0\n\t"
+ 					 "ld [%%l0], %%i1\n\t"
+-					 : : "m"(&nRegReturn), "m"(((long*)&nRegReturn) +1) );
++					  : : "m"(pRegReturn) );
+ 
+ 			break;
+ 		case typelib_TypeClass_FLOAT:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ld [%%l0], %%f0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_DOUBLE:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ldd [%%l0], %%f0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 		case typelib_TypeClass_VOID:
+ 			break;
+ 		default:
+ 			__asm__( "ld %0, %%l0\n\t"
+ 					 "ld [%%l0], %%i0\n"
+-					 : : "m"(&nRegReturn) );
++					 : : "m"(pRegReturn) );
+ 			break;
+ 	}
+ 
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+retrieving revision 1.40.32.3
+diff -u -u -r1.42 -r1.40.32.3
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	13 Nov 2005 01:26:04 -0000	1.40.32.3
+@@ -1732,6 +1732,7 @@
+ 		my $target = "";
+ 		if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
+ 		if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
++		if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
+ 
+ 		my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";
+ 
+@@ -1912,6 +1913,7 @@
+ 		my $rpmdir;
+ 		if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
+ 		if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
++		if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
+ 
+ 		my $systemcall = "mv $rpmdir/* $newdir";	# moving the rpms into the directory "RPMS"
+ 
+@@ -1936,6 +1938,7 @@
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
++		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
+ 		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
+ 
+ 	}
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+retrieving revision 1.26.32.3
+diff -u -u -r1.29 -r1.26.32.3
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	13 Nov 2005 01:26:20 -0000	1.26.32.3
+@@ -311,7 +311,7 @@
+ 
+ 	if (( $installer::globals::compiler =~ /unx/ ) && ( $installer::globals::addpackagelist )) { $installer::globals::is_unix_multi = 1; }
+ 	
+-	if ( $installer::globals::compiler =~ /unxlngi/ || $installer::globals::compiler =~ /unxlngx/ )
++	if ( $installer::globals::compiler =~ /unxlngi/ || $installer::globals::compiler =~ /unxlngx/ || $installer::globals::compiler =~ /unxlngs/ ) 
+ 	{
+ 		$installer::globals::islinuxbuild = 1;
+ 		if ( $installer::globals::packageformat eq "rpm" )
diff --git a/patches/src680/disable-visibility-feature.diff b/patches/src680/disable-visibility-feature.diff
new file mode 100644
index 000000000..c5f36032d
--- /dev/null
+++ b/patches/src680/disable-visibility-feature.diff
@@ -0,0 +1,33 @@
+--- config_office/configure.in.ORG	2006-01-11 14:26:23.015610008 +0900
++++ config_office/configure.in	2006-01-11 14:26:55.673766908 +0900
+@@ -1099,18 +1099,18 @@
+ fi 
+ AC_SUBST(GCCVER)
+ 
+-if test "$GCC" = "yes"; then
+-   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+-   save_CFLAGS=$CFLAGS
+-   CFLAGS="$CFLAGS -fvisibility=hidden"
+-   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
+-   CFLAGS=$save_CFLAGS
+-   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
+-      AC_MSG_RESULT([yes])
+-   else
+-      AC_MSG_RESULT([no])
+-   fi
+-fi
++#if test "$GCC" = "yes"; then
++#   AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
++#   save_CFLAGS=$CFLAGS
++#   CFLAGS="$CFLAGS -fvisibility=hidden"
++#   AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
++#   CFLAGS=$save_CFLAGS
++#   if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
++#      AC_MSG_RESULT([yes])
++#   else
++#      AC_MSG_RESULT([no])
++#   fi
++#fi
+ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
+ 
+ if test "$GCC" = "yes"; then
diff --git a/patches/src680/gcc-version-fix.diff b/patches/src680/gcc-version-fix.diff
new file mode 100644
index 000000000..f4124c74f
--- /dev/null
+++ b/patches/src680/gcc-version-fix.diff
@@ -0,0 +1,11 @@
+--- solenv/bin/getcompver.awk.orig	2005-12-01 03:45:51.000000000 +0100
++++ solenv/bin/getcompver.awk	2005-12-01 03:46:18.000000000 +0100
+@@ -71,7 +71,7 @@
+         CCversion = $0
+     }
+ }
+-/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ {
++/^[0-9]*[.][0-9]*[.][0-9]*-.*$/ {
+     if ( compiler_matched == 0 ) {
+         CCversion = substr($0, 0, index($0, "-") - 1)
+     }
diff --git a/patches/src680/gcj-HelpLinker-native.diff b/patches/src680/gcj-HelpLinker-native.diff
new file mode 100644
index 000000000..ff8eb6fd8
--- /dev/null
+++ b/patches/src680/gcj-HelpLinker-native.diff
@@ -0,0 +1,121 @@
+Index: set_soenv.in
+===================================================================
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.74
+diff -u -p -u -r1.74 set_soenv.in
+--- config_office/set_soenv.in	30 Aug 2005 09:12:51 -0000	1.74
++++ config_office/set_soenv.in	16 Sep 2005 10:53:11 -0000
+@@ -78,7 +78,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
+      $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, 
+      $URD_ONLY, $SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
+      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
+-     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE,
++     $STAR_REGISTRY, $STAR_RESOURCEPATH, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $GCJ_DATABASE, $GCJ_CACHEDIR,
+      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $NMAKE_PATH, 
+      $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
+      $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
+@@ -894,8 +894,10 @@ $CLASSPATH            = '$JAVA_HOME'.$ds
+ # Location of the JDK supported standard classes.zip file.
+ # see above for why the change
+ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$ps.'.';
+-# Localtion of gcj cache
+-$GCJ_DATABASE = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds."openoffice.org.gcjdb";
++# Location of gcj cache
++$GCJ_CACHEDIR = '$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.$ds;
++# Location of gcj database
++$GCJ_DATABASE = $GCJ_CACHEDIR."openoffice.org.gcjdb";
+ 
+ # Paths to run time shared libraries.
+ if ($platform =~ m/solaris/) 
+@@ -1659,6 +1661,7 @@ if ( $JDK ne "gcj" ) {
+    ToFile( "XCLASSPATH",        $XCLASSPATH,        "e" );
+ }
+ else {
++   ToFile( "GCJ_CACHEDIR",     $GCJ_CACHEDIR,       "e" );
+    ToFile( "GCJ_DATABASE",     $GCJ_DATABASE,       "e" );
+    ToFile( "JAVACACHE",        '@JAVACACHE@',       "e" );
+    ToFile( "AWTLIB",           '@AWTLIB@',          "e" );
+Index: util/target.pmk
+===================================================================
+RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 target.pmk
+--- helpcontent2/util/target.pmk	8 Sep 2005 03:01:39 -0000	1.10
++++ helpcontent2/util/target.pmk	16 Sep 2005 11:12:39 -0000
+@@ -46,5 +46,8 @@
+ 
+ $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
+ 	@+-$(MKDIR) -p $(@:d)
++.IF "$(JDK)" != "gcj"
+ 	$(JAVAI) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+-
++.ELSE
++	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
++.ENDIF
+Index: bin/deliver.pl
+===================================================================
+RCS file: /cvs/tools/solenv/bin/deliver.pl,v
+retrieving revision 1.92
+diff -u -p -u -r1.92 deliver.pl
+--- solenv/bin/deliver.pl	7 Sep 2005 22:07:53 -0000	1.92
++++ solenv/bin/deliver.pl	16 Sep 2005 10:53:51 -0000
+@@ -720,8 +720,10 @@ sub strip_target {
+ };
+ 
+ sub cachejar {
++    my $todir = $ENV{'GCJ_CACHEDIR'};
+     my $file = shift;
+-    my $to = $file.".so";
++    $lib = basename($file);
++    my $to = $todir."lib".$lib.".so";
+     print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
+     print "Caching 1/2: $ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file\n";
+     system("$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o $to $file");
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/util/xmlhelp/prj/d.lst,v
+retrieving revision 1.12
+diff -u -p -u -r1.12 d.lst
+--- xmlhelp/prj/d.lst	27 May 2003 15:54:01 -0000	1.12
++++ xmlhelp/prj/d.lst	16 Sep 2005 10:51:40 -0000
+@@ -1,4 +1,5 @@
+ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
++..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
+ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
+ ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
+ ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
+Index: source/com/sun/star/help/makefile.mk
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
+retrieving revision 1.20
+diff -u -p -u -r1.20 makefile.mk
+--- xmlhelp/source/com/sun/star/help/makefile.mk	11 Apr 2005 09:31:48 -0000	1.20
++++ xmlhelp/source/com/sun/star/help/makefile.mk	21 Sep 2005 13:00:11 -0000
+@@ -75,10 +75,27 @@ JAVACLASSFILES += \
+ 	$(CLASSDIR)$/$(PACKAGE)$/FileURLStreamHandlerWithNotify.class
+ .ENDIF
+ 
++.IF "$(JDK)"=="gcj"
++
++.IF "$(SYSTEM_DB)"=="YES"
++$(BIN)$/HelpLinker: $(LB)$/libdb.jar.a
++.ELSE
++$(BIN)$/HelpLinker:
++.ENDIF
++	$(JAVACOMPILER) --main=com.sun.star.help.HelpLinker -o $(BIN)$/HelpLinker \
++		-O2 -Wl,-Bsymbolic -findirect-dispatch -fjni -fno-assert -Wno-deprecated \
++		$(JAVACPS) $(CLASSPATH) $(JAVAFILES) $(SOLARLIB) -L$(LB) \
++		-ldb.jar -lxmlsearch.jar -lxt.jar -lunoil.jar -ljurt.jar -lridl.jar
++
++$(LB)$/libdb.jar.a:
++	$(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni $(DB_JAR) -o $(LB)$/libdb.jar.a
++
++.ELSE
+ JARCLASSDIRS	= com
+ JARTARGET		= $(PRJNAME).jar
+ JARCOMPRESS 	= TRUE
+ CUSTOMMANIFESTFILE = manifest
++.ENDIF
+ 
+ 
+ # --- Targets ------------------------------------------------------
diff --git a/patches/src680/gentoo-pax-fix.diff b/patches/src680/gentoo-pax-fix.diff
new file mode 100644
index 000000000..e0b4700e6
--- /dev/null
+++ b/patches/src680/gentoo-pax-fix.diff
@@ -0,0 +1,26 @@
+--- solenv/inc/unxlngi4.mk.orig	2005-10-29 17:09:48.000000000 +0200
++++ solenv/inc/unxlngi4.mk	2005-10-29 17:18:46.000000000 +0200
+@@ -138,8 +138,8 @@
+ LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+--- solenv/inc/unxlngi6.mk.orig	2005-10-29 17:16:27.000000000 +0200
++++ solenv/inc/unxlngi6.mk	2005-10-29 17:19:08.000000000 +0200
+@@ -147,8 +147,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
diff --git a/patches/src680/jvmfwk-gij-4.1.diff b/patches/src680/jvmfwk-gij-4.1.diff
new file mode 100644
index 000000000..c35a40ea7
--- /dev/null
+++ b/patches/src680/jvmfwk-gij-4.1.diff
@@ -0,0 +1,38 @@
+--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.ark	2005-12-21 14:57:59.000000000 +0000
++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx	2005-12-21 14:58:36.000000000 +0000
+@@ -128,11 +128,13 @@
+     rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
+     rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
+     rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
++    rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
+     if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
+             || sVendor2.equals(pInfo->sVendor) == sal_True
+             || sVendor3.equals(pInfo->sVendor) == sal_True
+             || sVendor4.equals(pInfo->sVendor) == sal_True
+-            || sVendor5.equals(pInfo->sVendor) == sal_True))
++            || sVendor5.equals(pInfo->sVendor) == sal_True
++	    || sVendor6.equals(pInfo->sVendor) == sal_True))
+         return 0;
+     
+     rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
+--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.ark	2005-12-21 17:09:49.000000000 +0000
++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2005-12-21 17:10:16.000000000 +0000
+@@ -57,6 +57,8 @@
+         "bin/gij",
+ 	"gij-4.0",
+ 	"bin/gij-4.0"
++	"gij-4.1",
++	"bin/gij-4.1"
+     };
+     *size = sizeof (ar) / sizeof (char*);
+     return ar;
+@@ -65,7 +67,8 @@
+ char const* const* GnuInfo::getRuntimePaths(int * size)
+ {
+     static char const* ar[]= {
+-          "/lib/libgcj.so.6"
++          "/lib/libgcj.so.7"
++        , "/lib/libgcj.so.6"
+ #if 0   //unreliable
+ 	, "/lib/libgcj.so.5"
+         , "/lib/libgcj.so.4"
diff --git a/patches/src680/mandriva-java32_64.diff b/patches/src680/mandriva-java32_64.diff
new file mode 100644
index 000000000..2a2c67638
--- /dev/null
+++ b/patches/src680/mandriva-java32_64.diff
@@ -0,0 +1,18 @@
+--- desktop/scripts/soffice.sh.java32_64	2005-09-08 19:02:48.000000000 +0200
++++ desktop/scripts/soffice.sh	2005-09-19 15:27:10.000000000 +0200
+@@ -147,6 +147,15 @@
+     ;;
+ esac
+ 
++# 32-bit JAVA kludge for x86_64 platforms with native JRE
++if [ "`uname -m`" = "x86_64" -a -n "$JAVA32_HOME" ]; then
++    case `/usr/bin/file "$sd_prog/$sd_binary"` in
++    *"ELF 32"*)
++        export JAVA_HOME=$JAVA32_HOME
++        ;;
++    esac
++fi
++
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/javaldx" ] ; then
+     java_ld_library_path=`"$sd_prog/javaldx"`
diff --git a/patches/src680/novell-win32-installer-branding.diff b/patches/src680/novell-win32-installer-branding.diff
new file mode 100644
index 000000000..c93c085e9
--- /dev/null
+++ b/patches/src680/novell-win32-installer-branding.diff
@@ -0,0 +1,99 @@
+--- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf	Thu Jan 26 17:37:46 2006
++++ instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf.new	Thu Jan 26 17:37:58 2006
+@@ -379,8 +379,8 @@
+ de = "Abbruch"
+ 
+ [OOO_CONTROL_124]
+-en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+-de = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
++en-US = "Build contributed in collaboration with the community by Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
++de = "Build contributed in collaboration with the community by Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+ 
+ [OOO_CONTROL_125]
+ en-US = "&Next >"
+--- instsetoo_native/util/makefile.mk.old	2006-01-16 15:10:22.000000000 +0200
++++ instsetoo_native/util/makefile.mk	2006-01-17 12:58:26.000000000 +0200
+@@ -353,7 +353,13 @@
+ 	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ 	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+-	+$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++	+$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++	+$(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+ 
+--- instsetoo_native/util/openoffice.lst.old	2006-01-17 12:23:31.000000000 +0200
++++ instsetoo_native/util/openoffice.lst	2006-01-17 14:24:08.000000000 +0200
+@@ -26,9 +26,9 @@
+ 			USE_FILEVERSION 1
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -70,9 +70,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			JAVAPRODUCT 1
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -113,9 +113,9 @@
+ 			LIBRARYVERSION 8.0.1
+ 			PATCHCODEFILE ooo_patchcodes.txt
+ 			CODEFILENAME codes_ooodev.txt
+-			DOWNLOADBANNER	ooobanner.bmp
+-			DOWNLOADBITMAP	ooobitmap.bmp
+-			DOWNLOADSETUPICO	ooosetup.ico
++			DOWNLOADBANNER	ooobanner_nld.bmp
++			DOWNLOADBITMAP	ooobitmap_nld.bmp
++			DOWNLOADSETUPICO	ooosetup_nld.ico
+ 		}
+ 		active			1
+ 		compression		5
+@@ -141,9 +141,9 @@
+             PACKAGEREVISION 1
+             LICENSENAME LGPL
+             NOVERSIONINDIRNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_nld.bmp
++            DOWNLOADBITMAP ooobitmap_nld.bmp
++            DOWNLOADSETUPICO ooosetup_nld.ico
+         }
+         active 1
+         compression 5
+@@ -169,9 +169,9 @@
+             LICENSENAME LGPL, SISSL
+             NOVERSIONINDIRNAME 0
+             NOSPACEINDIRECTORYNAME 1
+-            DOWNLOADBANNER ooobanner.bmp
+-            DOWNLOADBITMAP ooobitmap.bmp
+-            DOWNLOADSETUPICO ooosetup.ico
++            DOWNLOADBANNER ooobanner_nld.bmp
++            DOWNLOADBITMAP ooobitmap_nld.bmp
++            DOWNLOADSETUPICO ooosetup_nld.ico
+         }
+         active 1
+         compression 5
diff --git a/patches/src680/pld-splash.diff b/patches/src680/pld-splash.diff
new file mode 100644
index 000000000..12adeb859
--- /dev/null
+++ b/patches/src680/pld-splash.diff
@@ -0,0 +1,43 @@
+Index: svx/prj/d.lst
+===================================================================
+RCS file: /cvs/graphics/svx/prj/d.lst,v
+retrieving revision 1.108
+diff -u -r1.108 d.lst
+--- svx/prj/d.lst	9 Dec 2004 16:36:45 -0000	1.108
++++ svx/prj/d.lst	16 Dec 2004 12:43:47 -0000
+@@ -55,7 +55,7 @@
+ ..\res\cjkintro.bmp %COMMON_DEST%\pck%_EXT%\starsuite_bitmap\intro.bmp
+ ..\res\ofaabout.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\about.bmp
+ ..\res\soffice.bmp %COMMON_DEST%\pck%_EXT%\staroffice_bitmap\intro.bmp
+-..\res\ooointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
++..\res\openintro_pld.bmp %COMMON_DEST%\pck%_EXT%\openoffice\intro.bmp
+ ..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
+ 
+ mkdir: %_DEST%\inc%_EXT%\svx
+Index: svx/source/intro/ooo.src
+===================================================================
+RCS file: /cvs/graphics/svx/source/intro/ooo.src,v
+retrieving revision 1.11
+diff -u -r1.11 ooo.src
+--- svx/source/intro/ooo.src	7 Jan 2005 09:49:30 -0000	1.11
++++ svx/source/intro/ooo.src	1 Feb 2005 16:48:49 -0000
+@@ -48,8 +48,8 @@
+ #include "svxids.hrc"
+ #include "intro.hrc"
+ 
+-#ifdef BUILD_SPECIAL
+-#define OOO_VENDOR "Sun Microsystems Inc."
++#if 1
++#define OOO_VENDOR "PLD/Linux Team"
+ #else
+ //#define OOO_VENDOR "my company"
+ #endif
+@@ -56,7 +56,7 @@
+ 
+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
+ {
+-	File = "openabout.bmp" ;
++	File = "openabout_pld.bmp" ;
+ };
+ 
+ String RID_APPTITLE
diff --git a/patches/src680/sparc-bridges-use-g++-3.4.diff b/patches/src680/sparc-bridges-use-g++-3.4.diff
deleted file mode 100644
index 5d3867f27..000000000
--- a/patches/src680/sparc-bridges-use-g++-3.4.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk,v
-retrieving revision 1.4
-diff -u -u -r1.4 makefile.mk
---- bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk	11 May 2005 11:04:53 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk	29 Aug 2005 05:15:21 -0000
-@@ -83,6 +83,10 @@
- 
- CFLAGSNOOPT=-O0
- 
-+# hack.
-+CXX=g++-3.4
-+HAVE_GCC_VISIBILITY_FEATURE=FALSE
-+
- NOOPTFILES = \
- 	$(SLO)$/uno2cpp.obj	\
- 	$(SLO)$/cpp2uno.obj	\
diff --git a/patches/src680/speed-uiconfig.diff b/patches/src680/speed-uiconfig.diff
deleted file mode 100644
index d3b6381dc..000000000
--- a/patches/src680/speed-uiconfig.diff
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: ucb/source/ucp/file/filrset.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/filrset.cxx,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 filrset.cxx
---- ucb/source/ucp/file/filrset.cxx	9 Sep 2005 15:27:30 -0000	1.17
-+++ ucb/source/ucp/file/filrset.cxx	26 Oct 2005 13:32:34 -0000
-@@ -322,12 +322,12 @@ XResultSet_impl::OneMore(
- 	osl::FileBase::RC err;
- 	sal_Bool IsRegular;
- 	rtl::OUString aUnqPath;
--	osl::DirectoryItem  m_aDirIte;
-+	osl::DirectoryItem  aDirItem;
- 	Reference< sdbc::XRow > aRow;
- 
- 	while( true )
- 	{
--		err = m_aFolder.getNextItem( m_aDirIte );
-+		err = m_aFolder.getNextItem( aDirItem );
- 
- 		if( err == osl::FileBase::E_NOENT || err == osl::FileBase::E_INVAL )
- 		{
-@@ -337,7 +337,7 @@ XResultSet_impl::OneMore(
- 		}
- 		else if( err == osl::FileBase::E_None )
- 		{
--			aRow = m_pMyShell->getv( -1,this,m_sProperty,m_aDirIte,aUnqPath,IsRegular );
-+			aRow = m_pMyShell->getv( -1,this,m_sProperty,aDirItem,aUnqPath,IsRegular );
- 
- 			if( m_nOpenMode == OpenMode::DOCUMENTS && IsRegular )
- 			{
-Index: ucb/source/ucp/file/shell.cxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/shell.cxx,v
-retrieving revision 1.84
-diff -u -p -u -r1.84 shell.cxx
---- ucb/source/ucp/file/shell.cxx	9 Sep 2005 15:29:56 -0000	1.84
-+++ ucb/source/ucp/file/shell.cxx	26 Oct 2005 13:32:35 -0000
-@@ -1119,8 +1119,8 @@ shell::getv( sal_Int32 CommandId,
- {
- 	uno::Sequence< uno::Any > seq( properties.getLength() );
- 
--	sal_Int32 n_Mask;
--	getMaskFromProperties( n_Mask,properties );
-+	sal_Int32 n_Mask = getMaskFromProperties( properties );
-+	
- 	osl::FileStatus aFileStatus( n_Mask );
- 
- 	osl::DirectoryItem aDirItem;
-@@ -2203,15 +2203,21 @@ sal_Bool SAL_CALL shell::ensuredir( sal_
- //
- 
- 
--void SAL_CALL
-+sal_Int32 SAL_CALL
- shell::getMaskFromProperties(
--    sal_Int32& n_Mask,
--    const uno::Sequence< beans::Property >& seq )
-+    const uno::Sequence< beans::Property >& seq,
-+	bool *bNameOnly)
- {
--    n_Mask = 0;
-+    sal_Int32 n_Mask = 0;
-+	if(bNameOnly)
-+		*bNameOnly = false;
-     for(sal_Int32 j = 0; j < seq.getLength(); ++j) {
-         if(seq[j].Name == Title)
-+		{
-             n_Mask |= FileStatusMask_FileName;
-+			if(bNameOnly)
-+				*bNameOnly = seq.getLength() == 1;
-+		}
-         else if(seq[j].Name == CasePreservingURL)
-             n_Mask |= FileStatusMask_FileURL;
-         else if(seq[j].Name == IsDocument ||
-@@ -2240,6 +2246,7 @@ shell::getMaskFromProperties(
- //         n_Mask |= FileStatusMask_FileSize;
- //         n_Mask |= FileStatusMask_Attributes;
-     }
-+	return n_Mask;
- }
- 
- 
-@@ -2534,44 +2541,52 @@ shell::getv(
- 	sal_Bool& aIsRegular )
- {
- 	uno::Sequence< uno::Any > seq( properties.getLength() );
-+	
-+	bool bNameOnly = false;
-+	sal_Int32 n_Mask = getMaskFromProperties( properties, &bNameOnly );
- 
--	sal_Int32 n_Mask;
--	getMaskFromProperties( n_Mask,properties );
-+	sal_Int32 n_RealMask = n_Mask;
-+	if ( !bNameOnly )
-+	{   // Always retrieve the type and the target URL because item might be a link
-+		n_RealMask |= ( FileStatusMask_FileURL |
-+						FileStatusMask_Type |
-+						FileStatusMask_LinkTargetURL );
-+	}
- 
--	// Always retrieve the type and the target URL because item might be a link
--	osl::FileStatus aFileStatus( n_Mask |
--                                 FileStatusMask_FileURL |
--                                 FileStatusMask_Type |
--                                 FileStatusMask_LinkTargetURL );
-+	osl::FileStatus aFileStatus( n_RealMask );
-+	
- 	aDirItem.getFileStatus( aFileStatus );
- 	aUnqPath = aFileStatus.getFileURL();
- 
- 	// If the directory item type is a link retrieve the type of the target
- 
--	if ( aFileStatus.getFileType() == osl::FileStatus::Link )
-+	if ( n_Mask & FileStatusMask_Type )
- 	{
--        // Assume failure
--		osl::FileBase::RC	result = osl::FileBase::E_INVAL;
--		osl::DirectoryItem	aTargetItem;
--		osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
--		if ( aTargetItem.is() )
--		{
--			osl::FileStatus	aTargetStatus( FileStatusMask_Type );
--
--			if ( osl::FileBase::E_None ==
--                 ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
--				aIsRegular =
--                    aTargetStatus.getFileType() == osl::FileStatus::Regular;
--		}
--
--		// FIXME: aIsRegular undefined in error case.
--        // Don't know how to transport error
--		OSL_ENSURE( osl::FileBase::E_None == result,
--                    "shell::getv: Link target can't be retrieved."
--                    " Missing error handling !!!" );
-+		if ( aFileStatus.getFileType() == osl::FileStatus::Link )
-+		{
-+			// Assume failure
-+			osl::FileBase::RC	result = osl::FileBase::E_INVAL;
-+			osl::DirectoryItem	aTargetItem;
-+			osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
-+			if ( aTargetItem.is() )
-+			{
-+				osl::FileStatus	aTargetStatus( FileStatusMask_Type );
-+
-+				if ( osl::FileBase::E_None ==
-+					 ( result = aTargetItem.getFileStatus( aTargetStatus ) ) )
-+					aIsRegular =
-+						aTargetStatus.getFileType() == osl::FileStatus::Regular;
-+			}
-+
-+			// FIXME: aIsRegular undefined in error case.
-+			// Don't know how to transport error
-+			OSL_ENSURE( osl::FileBase::E_None == result,
-+						"shell::getv: Link target can't be retrieved."
-+						" Missing error handling !!!" );
-+		}
-+		else
-+			aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
- 	}
--	else
--		aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular;
- 
- 	registerNotifier( aUnqPath,pNotifier );
- 	insertDefaultProperties( aUnqPath );
-Index: ucb/source/ucp/file/shell.hxx
-===================================================================
-RCS file: /cvs/ucb/ucb/source/ucp/file/shell.hxx,v
-retrieving revision 1.21
-diff -u -p -u -r1.21 shell.hxx
---- ucb/source/ucp/file/shell.hxx	9 Sep 2005 15:30:10 -0000	1.21
-+++ ucb/source/ucp/file/shell.hxx	26 Oct 2005 13:32:35 -0000
-@@ -583,10 +583,10 @@ namespace fileaccess {
- 		 *  osl::DirectoryItem::getFileStatus fills the required fields.
- 		 */
- 
--		void SAL_CALL
-+		sal_Int32 SAL_CALL
- 		getMaskFromProperties(
--			sal_Int32& n_Mask,
--			const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq );
-+			const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
-+			bool *bNameOnly = NULL);
- 
- 
- 		void SAL_CALL
diff --git a/patches/src680/powerpc-svx-customshapes-NOOPTFILES.diff b/patches/src680/svx-customshapes-NOOPTFILES.diff
index 340e68040..0ef5ae719 100644
--- a/patches/src680/powerpc-svx-customshapes-NOOPTFILES.diff
+++ b/patches/src680/svx-customshapes-NOOPTFILES.diff
@@ -10,7 +10,7 @@ diff -u -u -r1.9 makefile.mk
  NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
  .ENDIF
 +# http://gcc.gnu.org/PR22392
-+.IF "$(OS)"=="LINUX" && "$(CPU)"=="P"
++.IF "$(OS)"=="LINUX" &&  "$(CPU)"=="P" || "$(CPU)"=="Y")
 +NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj
 +.ENDIF
  
diff --git a/patches/src680/ucb-tdoc-template-storage-fix.diff b/patches/src680/ucb-tdoc-template-storage-fix.diff
new file mode 100644
index 000000000..b9637deed
--- /dev/null
+++ b/patches/src680/ucb-tdoc-template-storage-fix.diff
@@ -0,0 +1,56 @@
+Index: ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/tdoc/tdoc_docmgr.cxx,v
+retrieving revision 1.11
+diff -u -p -r1.11 tdoc_docmgr.cxx
+--- ucb/source/ucp/tdoc/tdoc_docmgr.cxx	3 Nov 2005 12:39:48 -0000	1.11
++++ ucb/source/ucp/tdoc/tdoc_docmgr.cxx	25 Jan 2006 16:28:27 -0000
+@@ -229,7 +229,12 @@ void SAL_CALL OfficeDocumentsManager::no
+     if ( Event.EventName.equalsAsciiL(
+                 RTL_CONSTASCII_STRINGPARAM( "OnLoadFinished" ) ) // document loaded
+          || Event.EventName.equalsAsciiL(
+-                RTL_CONSTASCII_STRINGPARAM( "OnCreate" ) ) ) // document created
++                RTL_CONSTASCII_STRINGPARAM( "OnCreate" ) ) 
++         || Event.EventName.equalsAsciiL(
++                RTL_CONSTASCII_STRINGPARAM( "OnViewCreated" ) ) 
++         || Event.EventName.equalsAsciiL(
++                RTL_CONSTASCII_STRINGPARAM( "OnNew" ) ) 
++    ) // document created
+     {
+         if ( isOfficeDocument( Event.Source ) )
+         {
+@@ -239,12 +242,32 @@ void SAL_CALL OfficeDocumentsManager::no
+                  xModel( Event.Source, uno::UNO_QUERY );
+             OSL_ENSURE( xModel.is(), "Got no frame::XModel!" );
+ 
+-            DocumentList::const_iterator it = m_aDocs.begin();
++            DocumentList::iterator it = m_aDocs.begin();
+             while ( it != m_aDocs.end() )
+             {
+                 if ( (*it).second.xModel == xModel )
+                 {
+-                    // already known.
++                    // doc is already known.
++                    // but... for templates event OnViewCreated can signal the
++                    // new temporary storage the doc uses, so examine
++                    // the xStorage for the Model and change it
++                    // if different from existing XStorage
++                    if ( Event.EventName.equalsAsciiL(
++                        RTL_CONSTASCII_STRINGPARAM( "OnViewCreated" ) ) 
++                    ||  Event.EventName.equalsAsciiL(
++                RTL_CONSTASCII_STRINGPARAM( "OnNew" ) ) 
++)
++                    {
++                        uno::Reference< document::XStorageBasedDocument >
++                        xDoc( Event.Source, uno::UNO_QUERY );
++                        OSL_ENSURE( xDoc.is(), "Got no document::XStorageBasedDocument!" );
++
++                        uno::Reference< embed::XStorage > xStorage
++                    	    = xDoc->getDocumentStorage();
++                        OSL_ENSURE( xDoc.is(), "Got no document storage!" );
++                        if ( ! ( xStorage == (*it).second.xStorage ) )
++                            (*it).second.xStorage  = xStorage;
++                    }
+                     break;
+                 }
+                 ++it;
diff --git a/patches/src680/use-free-jaxp-from-system.diff b/patches/src680/use-free-jaxp-from-system.diff
new file mode 100644
index 000000000..e181517db
--- /dev/null
+++ b/patches/src680/use-free-jaxp-from-system.diff
@@ -0,0 +1,19 @@
+--- external/prj/d.lst	2006-01-12 23:46:00.761203464 +0100
++++ external/prj/d.lst	2006-01-12 23:58:54.989502872 +0100
+@@ -23,6 +23,7 @@
+ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
++/usr/share/java/jaxp-1.2.jar %_DEST%\bin%_EXT%\jaxp.jar
+ ..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
+ 
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+--- helpcontent2/settings.pmk	2006-01-12 23:46:00.714210608 +0100
++++ helpcontent2/settings.pmk	2006-01-13 00:01:56.862853920 +0100
+@@ -1,5 +1,5 @@
+ 
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar
+ 
+ .IF "$(SYSTEM_DB)" == "YES"
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
diff --git a/patches/src680/use-free-xt-from-system-sarge.diff b/patches/src680/use-free-xt-from-system-sarge.diff
new file mode 100644
index 000000000..f48f5a188
--- /dev/null
+++ b/patches/src680/use-free-xt-from-system-sarge.diff
@@ -0,0 +1,17 @@
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/util/external/prj/d.lst,v
+retrieving revision 1.21
+diff -u -u -r1.21 d.lst
+--- external/prj/d.lst 24 Nov 2004 15:13:13 -0000      1.21
++++ external/prj/d.lst 2 Jun 2005 17:14:27 -0000
+@@ -23,7 +23,7 @@
+ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ /usr/share/java/jaxp-1.2.jar %_DEST%\bin%_EXT%\jaxp.jar
+-..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
++/usr/share/java/xt.jar %_DEST%\bin%_EXT%\xt.jar
+
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+ ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
diff --git a/patches/src680/use-free-xt-from-system.diff b/patches/src680/use-free-xt-from-system.diff
new file mode 100644
index 000000000..9c9e62cd9
--- /dev/null
+++ b/patches/src680/use-free-xt-from-system.diff
@@ -0,0 +1,36 @@
+Index: prj/d.lst
+===================================================================
+RCS file: /cvs/util/external/prj/d.lst,v
+retrieving revision 1.21
+diff -u -u -r1.21 d.lst
+--- external/prj/d.lst 24 Nov 2004 15:13:13 -0000      1.21
++++ external/prj/d.lst 2 Jun 2005 17:14:27 -0000
+@@ -23,7 +23,7 @@
+ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+-..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
++/usr/share/java/xt-0.20050823.jar %_DEST%\bin%_EXT%\xt.jar
+
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+ ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
+--- xmlhelp/source/com/sun/star/help/makefile.mk-old	2006-01-08 19:15:49.668850056 +0100
++++ xmlhelp/source/com/sun/star/help/makefile.mk	2006-01-08 19:18:52.384073120 +0100
+@@ -78,7 +78,7 @@
+ .IF "$(JDK)"=="gcj"
+ 
+ .IF "$(SYSTEM_DB)"=="YES"
+-$(BIN)$/HelpLinker: $(LB)$/libdb.jar.a
++$(BIN)$/HelpLinker: $(LB)$/libdb.jar.a $(LB)$/libxt.jar.a
+ .ELSE
+ $(BIN)$/HelpLinker:
+ .ENDIF
+@@ -89,6 +89,8 @@
+ 
+ $(LB)$/libdb.jar.a:
+ 	$(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni $(DB_JAR) -o $(LB)$/libdb.jar.a
++$(LB)$/libxt.jar.a:
++	$(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni /usr/share/java/xt.jar  $(SOLARVERSION)/$(INPATH)/bin/xt-xmlsearch.jar -o $(LB)$/libxt.jar.a
+ 
+ .ELSE
+ JARCLASSDIRS	= com
diff --git a/patches/src680/win32-build-fixes.diff b/patches/src680/win32-build-fixes.diff
index 3d809148a..98e43be58 100644
--- a/patches/src680/win32-build-fixes.diff
+++ b/patches/src680/win32-build-fixes.diff
@@ -32,3 +32,22 @@
  .ELSE
  RSCDEFS+=-DBUILD_SPECIAL=True -DOOO_LICENSE="LGPL"
  .ENDIF
+--- setup_native/source/win32/msi-encodinglist.txt	Mon Jan 16 17:53:13 2006
++++ setup_native/source/win32/msi-encodinglist.txt	Mon Jan 16 17:53:18 2006
+@@ -94,3 +94,6 @@
+ ve       0  1075   # Venda
+ ga       0  2108   # Irish
+ mk    1251  1071   # Macedonian
++gl    1252  1110   # Galician
++kn       0  1099   # Kannada
++ms       0  1086   # Malay (Malaysian)
+--- solenv/inc/postset.mk	Mon Jan 16 18:08:43 2006
++++ solenv/inc/postset.mk	Mon Jan 16 18:09:25 2006
+@@ -39,6 +39,6 @@
+ defaultlangiso=en-US
+ 
+ # Complete list of all supported ISO codes
+-completelangiso=af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu
++completelangiso=af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el en-GB en-US en-ZA es et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km ko lo lt lv mk ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv sw sw-TZ ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu
+ 
+ alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/patches/vba/vba-optionbasesupport.diff b/patches/vba/vba-optionbasesupport.diff
new file mode 100644
index 000000000..029ca3539
--- /dev/null
+++ b/patches/vba/vba-optionbasesupport.diff
@@ -0,0 +1,263 @@
+Index: basic/source/runtime/runtime.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/runtime/runtime.cxx,v
+retrieving revision 1.25
+diff -u -p -r1.25 runtime.cxx
+--- basic/source/runtime/runtime.cxx	4 Nov 2005 15:33:49 -0000	1.25
++++ basic/source/runtime/runtime.cxx	21 Dec 2005 10:27:06 -0000
+@@ -1116,4 +1271,10 @@ void SbiRuntime::DllCall
+ 		Error( nErr );
+ 	PushVar( pRes );
+ }
+-
++#ifdef ENABLE_VBA
++USHORT
++SbiRuntime::GetImageFlag( USHORT n ) const
++{ 
++	return pImg->GetFlag( n ); 
++}
++#endif //ENABLE_VBA
+Index: basic/source/inc/runtime.hxx
+===================================================================
+RCS file: /cvs/script/basic/source/inc/runtime.hxx,v
+retrieving revision 1.26
+diff -u -p -r1.26 runtime.hxx
+--- basic/source/inc/runtime.hxx	4 Nov 2005 15:33:21 -0000	1.26
++++ basic/source/inc/runtime.hxx	21 Dec 2005 10:47:23 -0000
+@@ -467,6 +467,9 @@ class SbiRuntime
+ 	void StepDCREATE_REDIMP(USHORT,USHORT), StepDCREATE_IMPL(USHORT,USHORT,BOOL);
+ 	void StepFIND_CM( USHORT, USHORT );
+ public:
++#ifdef ENABLE_VBA
++	USHORT		GetImageFlag( USHORT n ) const;
++#endif //ENABLE_VBA
+ 	xub_StrLen  nLine,nCol1,nCol2;	// aktuelle Zeile, Spaltenbereich
+ 	SbiRuntime* pNext;               // Stack-Chain
+ 
+Index: basic/source/comp/parser.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/comp/parser.cxx,v
+retrieving revision 1.13
+diff -u -p -r1.13 parser.cxx
+--- basic/source/comp/parser.cxx	29 Sep 2005 16:17:04 -0000	1.13
++++ basic/source/comp/parser.cxx	21 Dec 2005 10:27:07 -0000
+@@ -150,6 +151,9 @@ SbiParser::SbiParser( StarBASIC* pb, SbM
+ 	bSingleLineIf =
+ 	bExplicit = FALSE;
+ 	bClassModule = FALSE;
++#ifdef ENABLE_VBA
++	bOptionBaseOne = FALSE;
++#endif //ENABLE_VBA
+ 	pPool	 = &aPublics;
+ 	for( short i = 0; i < 26; i++ )
+ 		eDefTypes[ i ] = SbxVARIANT;    // Kein expliziter Defaulttyp
+@@ -678,6 +685,10 @@ void SbiParser::Option()
+ 				if( nVal == 0 || nVal == 1 )
+ 				{
+ 					nBase = (short) nVal;
++#ifdef ENABLE_VBA
++					if ( nBase )
++						bOptionBaseOne = TRUE;
++#endif //ENABLE_VBA
+ 					break;
+ 				}
+ 			}
+
+--- basic/source/inc/parser.hxx	29 Sep 2005 16:31:38 -0000	1.8
++++ basic/source/inc/parser.hxx	21 Dec 2005 11:19:01 -0000
+@@ -94,6 +94,9 @@ public:
+ 	BOOL		  bText;			// OPTION COMPARE TEXT
+ 	BOOL          bExplicit; 		// TRUE: OPTION EXPLICIT
+ 	BOOL          bClassModule;		// TRUE: OPTION ClassModule
++#ifdef ENABLE_VBA
++	BOOL          bOptionBaseOne;		// TRUE: OPTION Base 1 otherwise default Base 0
++#endif //ENABLE_VBA
+ 	IfaceVector   aIfaceVector;		// Holds all interfaces implemented by a class module
+ 	SbxDataType   eDefTypes[26];	// DEFxxx-Datentypen
+ 
+Index: basic/source/comp/codegen.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/comp/codegen.cxx,v
+retrieving revision 1.11
+diff -u -p -r1.11 codegen.cxx
+--- basic/source/comp/codegen.cxx	29 Sep 2005 16:17:04 -0000	1.11
++++ basic/source/comp/codegen.cxx	21 Dec 2005 10:27:07 -0000
+@@ -136,6 +136,10 @@ void SbiCodeGen::Save()
+ 	// OPTION EXPLICIT-Flag uebernehmen
+ 	if( pParser->bExplicit )
+ 		p->SetFlag( SBIMG_EXPLICIT );
++#ifdef ENABLE_VBA
++	if( pParser->bOptionBaseOne )
++		p->SetFlag( SBIMG_OPTIONBASEONE );
++#endif //ENABLE_VBA
+ 	
+ 	int nIfaceCount = 0;
+ 	if( pParser->bClassModule )
+Index: basic/source/inc/image.hxx
+===================================================================
+RCS file: /cvs/script/basic/source/inc/image.hxx,v
+retrieving revision 1.8
+diff -u -p -r1.8 image.hxx
+--- basic/source/inc/image.hxx	29 Sep 2005 16:31:38 -0000	1.8
++++ basic/source/inc/image.hxx	21 Dec 2005 10:27:07 -0000
+@@ -103,5 +103,8 @@ public:
+ #define	SBIMG_COMPARETEXT	0x0002	// OPTION COMPARE TEXT ist aktiv
+ #define	SBIMG_INITCODE		0x0004	// Init-Code vorhanden
+ #define	SBIMG_CLASSMODULE	0x0008	// OPTION ClassModule is active
++#ifdef ENABLE_VBA
++#define	SBIMG_OPTIONBASEONE	0x0010	// OPTION Base is 1
++#endif //ENABLE_VBA
+ 
+ #endif
+Index: basic/source/classes/sbunoobj.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/classes/sbunoobj.cxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 sbunoobj.cxx
+--- basic/source/classes/sbunoobj.cxx	29 Sep 2005 16:10:51 -0000	1.35
++++ basic/source/classes/sbunoobj.cxx	21 Dec 2005 10:27:09 -0000
+@@ -97,6 +97,10 @@ using namespace com::sun::star::bridge;
+ using namespace cppu;
+ using namespace rtl;
+ 
++#ifdef ENABLE_VBA 
++// Honour Option Base 1 
++bool IsBaseIndexOne();
++#endif //ENABLE_VBA
+ 
+ #include<sbstar.hxx>
+ #include<sbuno.hxx>
+@@ -566,7 +667,6 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 		case TypeClass_EXCEPTION:		break;
+ 		case TypeClass_ARRAY:			break;
+ 		*/
+-
+ 		case TypeClass_ENUM:
+ 		{
+ 			sal_Int32 nEnum = 0;
+@@ -574,7 +674,6 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 			pVar->PutLong( nEnum );
+ 		}
+ 			break;
+-
+ 		case TypeClass_SEQUENCE:
+ 		{
+ 			Reference< XIdlClass > xIdlTargetClass = TypeToIdlClass( aType );
+@@ -593,18 +692,29 @@ void unoToSbxValue( SbxVariable* pVar, c
+     		xArray = new SbxDimArray( eSbxElementType );
+ 			if( nLen > 0 )
+             {
+-				xArray->unoAddDim32( 0, nLen - 1 );
++#ifdef ENABLE_VBA
++// Honour Option Base 1
++				if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )	
++					xArray->unoAddDim32( 1, nLen );
++				else
++#endif //ENABLE_VBA
++					xArray->unoAddDim32( 0, nLen - 1 );
+ 
+ 			    // Elemente als Variablen eintragen
+ 			    for( i = 0 ; i < nLen ; i++ )
+ 			    {
++					sal_Int32 index = i;	
+ 				    // Elemente wandeln
+ 				    Any aElementAny = xIdlArray->get( aValue, (UINT32)i );
+ 				    SbxVariableRef xVar = new SbxVariable( eSbxElementType );
+ 				    unoToSbxValue( (SbxVariable*)xVar, aElementAny );
+-
++#ifdef ENABLE_VBA
++// Honour Option Base 1
++				if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )	
++					index++;
++#endif //ENABLE_VBA
+ 				    // Ins Array braten
+-				    xArray->Put32( (SbxVariable*)xVar, &i );
++				    xArray->Put32( (SbxVariable*)xVar, &index );
+ 			    }
+             }
+             else
+
+ 
+
+Index: basic/source/runtime/methods1.cxx
+===================================================================
+RCS file: /cvs/script/basic/source/runtime/methods1.cxx,v
+retrieving revision 1.23
+diff -u -p -r1.23 methods1.cxx
+--- basic/source/runtime/methods1.cxx	7 Sep 2005 21:40:12 -0000	1.23
++++ basic/source/runtime/methods1.cxx	21 Dec 2005 11:29:20 -0000
+@@ -100,6 +100,10 @@
+ #include "sbunoobj.hxx"
+ #endif
+ #include "propacc.hxx"
++#ifdef ENABLE_VBA
++#include <image.hxx>
++
++#endif //ENABLE_VBA
+ 
+ 
+ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+@@ -590,6 +594,20 @@ RTLFUNC(FreeLibrary)
+ 	ByteString aByteDLLName( rPar.Get(1)->GetString(), gsl_getSystemTextEncoding() );
+ 	pINST->GetDllMgr()->FreeDll( aByteDLLName );
+ }
++#ifdef ENABLE_VBA
++bool IsBaseIndexOne()
++{
++	bool result = false;
++	if ( pINST )
++		if ( pINST->pRun )
++		{
++			USHORT res = pINST->pRun->GetImageFlag( SBIMG_OPTIONBASEONE );
++			if ( res )
++				result = true;
++		}	
++	return result;
++}
++#endif //ENABLE_VBA
+ 
+ RTLFUNC(Array)
+ {
+@@ -598,13 +616,26 @@ RTLFUNC(Array)
+ 
+ 	// Option Base zunaechst ignorieren (kennt leider nur der Compiler)
+ 	if( nArraySize )
+-		pArray->AddDim( 0, nArraySize-1 );
++#ifdef ENABLE_VBA
++		if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )	
++			pArray->AddDim( 1, nArraySize );
++		else
++#endif //ENABLE_VBA
++			pArray->AddDim( 0, nArraySize-1 );
+ 	else
+ 		pArray->unoAddDim( 0, -1 );
+ 
+ 	// Parameter ins Array uebernehmen
+ 	for( short i = 0 ; i < nArraySize ; i++ )
+-		pArray->Put( rPar.Get(i+1), &i );
++	{
++		SbxVariable* pVar = rPar.Get(i+1);
++		short index = i;
++#ifdef ENABLE_VBA
++		if ( IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )
++			++index; 
++#endif //ENABLE_VBA
++		pArray->Put( pVar, &index );
++	}
+ 
+ 	// Array zurueckliefern
+ 	SbxVariableRef refVar = rPar.Get(0);
+@@ -637,7 +669,12 @@ RTLFUNC(DimArray)
+ 				StarBASIC::Error( SbERR_OUT_OF_RANGE );
+ 				ub = 0;
+ 			}
+-			pArray->AddDim32( 0, ub );
++#ifdef ENABLE_VBA
++			if (  IsBaseIndexOne() && SbiRuntime::isVBAEnabled() )
++				pArray->AddDim32( 1, ub+1 );
++			else
++#endif //ENABLE_VBA
++				pArray->AddDim32( 0, ub );
+ 		}
+ 	}
+ 	else
diff --git a/src/banner_nld.bmp b/src/banner_nld.bmp
new file mode 100644
index 000000000..0b9cb2953
--- /dev/null
+++ b/src/banner_nld.bmp
diff --git a/src/nologoinstall_nld.bmp b/src/nologoinstall_nld.bmp
new file mode 100644
index 000000000..71b67ac44
--- /dev/null
+++ b/src/nologoinstall_nld.bmp
diff --git a/src/ooobanner_translateorgza.bmp b/src/ooobanner_translateorgza.bmp
new file mode 100755
index 000000000..8d603b09d
--- /dev/null
+++ b/src/ooobanner_translateorgza.bmp
diff --git a/src/ooobitmap_translateorgza.bmp b/src/ooobitmap_translateorgza.bmp
new file mode 100755
index 000000000..1ffce7ac2
--- /dev/null
+++ b/src/ooobitmap_translateorgza.bmp
diff --git a/src/ooosetup_nld.ico b/src/ooosetup_nld.ico
new file mode 100644
index 000000000..2f4b0f90f
--- /dev/null
+++ b/src/ooosetup_nld.ico
diff --git a/src/ooosetup_translateorgza.ico b/src/ooosetup_translateorgza.ico
new file mode 100755
index 000000000..d3036b775
--- /dev/null
+++ b/src/ooosetup_translateorgza.ico
diff --git a/src/openabout_translateorgza.png b/src/openabout_translateorgza.png
new file mode 100644
index 000000000..a6d144c0f
--- /dev/null
+++ b/src/openabout_translateorgza.png
diff --git a/src/openintro_pld.bmp b/src/openintro_pld.bmp
index ed9977789..a29049860 100644
--- a/src/openintro_pld.bmp
+++ b/src/openintro_pld.bmp