Merge commit 'lesibel/master'

19 files changed, 478 insertions, 18 deletions

diff --git a/extra/hsqldb-java/Pkgfile b/extra/hsqldb-java/Pkgfile
index 25ff508cd..daf3c719c 100644
--- a/extra/hsqldb-java/Pkgfile
+++ b/extra/hsqldb-java/Pkgfile
@@ -2,16 +2,16 @@
 # URL: http://hsqldb.org/
 # Maintainer: NuTyX core team
 # Packager: lesibel at free dot fr
-# Depends on: jdk, unzip, ant
+# Depends on: ant, jdk, unzip
 
 name=hsqldb-java
 version=1.8.1.1
-release=1
+release=2
 source=(http://downloads.sourceforge.net/sourceforge/hsqldb/hsqldb_${version//./_}.zip  )
 
 build() {
-#  [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
-#  [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+  [ -z "${JAVA_HOME}" ] && . /etc/profile
+  [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
   cd ../src/hsqldb/build
 
diff --git a/extra/mozilla-common/.footprint b/extra/mozilla-common/.footprint
new file mode 100644
index 000000000..21359e72f
--- /dev/null
+++ b/extra/mozilla-common/.footprint
@@ -0,0 +1,4 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/profile.d/
+-rwxr-xr-x	root/root	etc/profile.d/mozilla-common.csh
+-rwxr-xr-x	root/root	etc/profile.d/mozilla-common.sh
diff --git a/extra/mozilla-common/.md5sum b/extra/mozilla-common/.md5sum
new file mode 100644
index 000000000..79a116cfb
--- /dev/null
+++ b/extra/mozilla-common/.md5sum
@@ -0,0 +1,2 @@
+924887e41bd96db37029f479befe40cf  mozilla-common.csh
+39451f6fe87d3cb224e140322c55eb27  mozilla-common.sh
diff --git a/extra/mozilla-common/Pkgfile b/extra/mozilla-common/Pkgfile
new file mode 100644
index 000000000..4fde276f3
--- /dev/null
+++ b/extra/mozilla-common/Pkgfile
@@ -0,0 +1,19 @@
+# Description: Common Initialization Profile for Mozilla.org products
+# URL: http://www.mozilla.org/
+# Maintainer: NuTyX core team
+# Packager: lesibel at free dot fr
+# Depends on: 
+
+name=mozilla-common
+version=1.4
+release=1
+
+install=mozilla-common.install
+
+source=( mozilla-common.sh mozilla-common.csh)
+
+build() {
+  install -m755 -d $PKG/etc/profile.d
+  install -m755 mozilla-common.{,c}sh $PKG/etc/profile.d/
+}
+
diff --git a/extra/mozilla-common/mozilla-common.csh b/extra/mozilla-common/mozilla-common.csh
new file mode 100644
index 000000000..09e49c783
--- /dev/null
+++ b/extra/mozilla-common/mozilla-common.csh
@@ -0,0 +1 @@
+setenv MOZ_PLUGIN_PATH "/usr/lib/mozilla/plugins"
diff --git a/extra/mozilla-common/mozilla-common.install b/extra/mozilla-common/mozilla-common.install
new file mode 100644
index 000000000..dc4228b08
--- /dev/null
+++ b/extra/mozilla-common/mozilla-common.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "relogin or source /etc/profile.d/mozilla-common.sh"
+}
+# vim:set ts=2 sw=2 et:
diff --git a/extra/mozilla-common/mozilla-common.sh b/extra/mozilla-common/mozilla-common.sh
new file mode 100644
index 000000000..132b5731e
--- /dev/null
+++ b/extra/mozilla-common/mozilla-common.sh
@@ -0,0 +1 @@
+export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins"
diff --git a/extra/openoffice-3.2/.md5sum b/extra/openoffice-3.2/.md5sum
new file mode 100644
index 000000000..541c5cab5
--- /dev/null
+++ b/extra/openoffice-3.2/.md5sum
@@ -0,0 +1,15 @@
+12560444c8a1d2eec4b68fe80472f1c9  OOo_3.2.0_src_binfilter.tar.bz2
+2094d07c26d2ffcf22e131658a531c67  OOo_3.2.0_src_core.tar.bz2
+586d4c9607a992169820fcccb1f5cc00  OOo_3.2.0_src_extensions.tar.bz2
+561ab60f79b0a25e90b68779227ef707  OOo_3.2.0_src_l10n.tar.bz2
+f6a738e87adf98ee4a14193f982c97e1  OOo_3.2.0_src_system.tar.bz2
+aee18235b0db7a26340d038a97c44ba6  OOo_3.2.0_src_testautomation.tar.bz2
+c8e82b4d2324fe62ad8c6e29213e80b5  buildfix-gcc44.diff
+863a3ab2c17a3d11b8fa3ec321986366  buildfix_FormulaMissingHeader.diff
+0cd6f3525939d3ef6e5a30ad30c25d27  buildfix_system_db48.diff
+71f136a31e296a04ab68932a31dd533e  default-no-startup-wizard.diff
+6c596129fb48316226ce3adfd3a4c86d  default-system-fpicker.diff
+40ca15a651e78d9cf44722046552d769  openoffice.profile
+1dc7480a04f572ad136d35923a2af66d  soffice-detect-mozilla-certificates.diff
+63209bbc64c901ef105455bda0282f45  startcenter.desktop
+e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
diff --git a/extra/openoffice-3.2/Pkgfile b/extra/openoffice-3.2/Pkgfile
new file mode 100644
index 000000000..5df08319e
--- /dev/null
+++ b/extra/openoffice-3.2/Pkgfile
@@ -0,0 +1,248 @@
+#  Description: Suite complète de office en logiciel libre 
+# URL:         http://www.openoffice.org
+# Packager:    Sibelle at free dot fr
+# Maintainer:  NuTyX packager team
+# Depends on:  crypto++, xmlsec, bison, subversion, libart_lgpl, xorg-libxtst, linux-pam, sane, p5-archive-zip, xulrunner, ant, cairo, gperf, cups, poppler, gconf, curl, python, libwpd, redland, xorg-libxaw, neon, dbus-glib, icu, libxslt, hicolor-icon-theme, desktop-file-utils, openldap, lucene, boost, hunspell, hsqldb-java, beanshell, saxon, vigra, hyphen, lpsolve, libmspack, myodbc, libgraphite, qt, gtk2
+
+#pstoedit
+
+name=openoffice
+version=3.2.0
+release=1
+OOdir=OOO320_m12
+backup=(usr/lib/openoffice/program/sofficerc)
+
+source=(http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_core.tar.bz2 \
+	http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_extensions.tar.bz2\
+	http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_l10n.tar.bz2 \
+	http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_binfilter.tar.bz2\
+	http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_system.tar.bz2\
+	http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_testautomation.tar.bz2\
+        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll \
+        startcenter.desktop \
+        default-no-startup-wizard.diff \
+        default-system-fpicker.diff \
+        soffice-detect-mozilla-certificates.diff \
+        buildfix-gcc44.diff \
+        buildfix_FormulaMissingHeader.diff \
+        buildfix_system_db48.diff \
+        openoffice.profile )
+
+
+build() {
+	install -D -m644 startcenter.desktop \
+        	$PKG/usr/share/ede/programs/Applications/startcenter.desktop
+	source /etc/profile
+	mkdir -p $PKG/opt
+	mkdir -p $PKG/usr/bin
+        mkdir -p $PKG/usr/share/icons
+        mkdir -p $PKG/usr/share/applications
+
+	# just to make sure that it will detect the desired JDK/JVM - we want jdk
+        unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
+        [ -z "${JAVA_HOME}" ] && . /etc/profile
+        JAVAHOME=${JAVA_HOME}
+        [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
+        [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+	# some speedups
+        export SMP="6"
+        MAXMODULESFLAG="-P${SMP}"
+        MAXPROCESSESFLAG="-P${SMP}"
+        export nodep=true
+        export NO_HIDS=true
+
+        cd $OOdir
+
+	# build fixes
+	patch -Np0 -i ../buildfix-gcc44.diff
+        patch -Np0 -i ../buildfix_FormulaMissingHeader.diff
+        patch -Np0 -i ../buildfix_system_db48.diff
+
+	# allows soffice to find the user's firefox profile so that it can read
+        # its digital certificates. Nss stores digital certificates in your mozilla firefox profile. 
+        patch -Np0 -i $SRC/soffice-detect-mozilla-certificates.diff
+
+	# remove the startup wizard
+        patch -Np0 -i $SRC/default-no-startup-wizard.diff
+        # enables the default system-file-picker in case we have that built
+        patch -Np0 -i $SRC/default-system-fpicker.diff
+
+	EXTRAOPTS="--with-stlport --without-system-graphite"
+
+	cd $SRC/$OOdir
+
+        # needed to build the OO-SDK
+        mv $SRC/unowinreg.dll external/unowinreg
+
+        # export C(XX)FLAGS
+        # http://www.openoffice.org/issues/show_bug.cgi?id=103205
+        unset CFLAGS
+        unset CXXFLAGS
+
+        # Need to recreate the configure script because of patches
+        autoreconf -v
+
+	./configure --with-build-version="$version NuTyX $OOdir" \
+		--with-vendor="NuTyX"\
+	        --prefix=/usr --exec-prefix=/usr\
+	        --with-lang="fr"\
+	        --with-dict=ALL\
+	        --disable-gnome-vfs\
+	        --disable-qadevooo\
+	        --disable-reportdesign\
+	        --disable-systray\
+	        --disable-mathmldtd\
+	        --enable-binfilter\
+	        --enable-cairo\
+	        --enable-crashdump=yes\
+	        --enable-cups\
+	        --enable-dbus\
+	        --enable-evolution2\
+	        --enable-gio\
+	        --enable-gtk\
+	        --enable-graphite\
+	        --enable-ldap\
+	        --enable-lockdown\
+	        --enable-mediawiki\
+	        --enable-minimizer\
+	        --enable-odk\
+	        --enable-opengl\
+	        --enable-pdfimport\
+	        --enable-presenter-console\
+	        --enable-report-builder\
+	        --enable-vba\
+	        --enable-verbose\
+	        --enable-wiki-publisher\
+	        --with-package-format=native\
+	        --without-fonts\
+	        --without-afms\
+	        --without-gpc\
+	        --without-nas\
+	        --without-ppds\
+	        --without-system-agg\
+	        --without-system-lucene\
+	        --with-openldap\
+	        --with-system-stdlibs\
+	        --with-system-libs\
+	        --with-system-sane-header\
+	        --with-system-mozilla=libxul\
+	        --with-system-xrender-headers\
+	        --with-system-headers\
+	        --with-system-redland\
+	        --with-alloc=system\
+	        --with-jdk-home=${JAVA_HOME}\
+	        --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+	        --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+	        --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+	        --with-use-shell=bash\
+	         $EXTRAOPTS
+        
+#	umask 0022
+#	unset LANG LC_ALL
+
+	# Setup environment for build
+	source LinuxX86Env.Set.sh
+
+	# Build dmake utility
+	./bootstrap
+ 
+#	cd instsetoo_native
+#        build.pl -P${SMP} #${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all \
+#	cp /usr/include/X11/extensions/Xrender.h x11_extensions/inc/Xrender.h
+
+	dmake -P2
+
+	cd $SRC/$OOdir
+
+        # install binaries
+        cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/fr/linux-2.6-intel/buildroot/* $PKG/
+
+        # move all to /usr/lib
+        mkdir -p $PKG/usr/lib
+        mv $PKG/opt/* $PKG/usr/lib/
+        rmdir $PKG/opt
+        
+        ## Step 1 
+        cd $PKG/usr/lib/openoffice.orgi
+        mv ure/ basis3.2/
+        cd basis3.2
+        rm ure-link && mv ure ure-link
+        ## Step 2
+        cd $PKG/usr/lib/
+        mv openoffice.org/basis3.2/ openoffice.org3/ 
+        cd openoffice.org3/ 
+        rm basis-link && mv basis3.2 basis-link
+        ## Step 3        
+        cd $PKG/usr/lib/ 
+        rmdir $PKG/usr/lib/openoffice.org
+        mv openoffice.org3 openoffice
+
+        # install all built dictionaries from source tree
+        pushd $SRC/$OOdir/dictionaries/unxlng?6.pro/bin
+        for i in `ls -1 dict-??.oxt`; do
+          install -D -m644 $i $PKG/usr/lib/openoffice/share/extension/install/$i
+        done
+        popd
+        
+        # install extensions
+       pushd $SRC/$OOdir/solver/320/unxlng?6.pro/bin
+         install -D -m644 sun-report-builder.oxt $PKG/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt
+         install -D -m644 swext/wiki-publisher.oxt $PKG/usr/lib/openoffice/share/extension/install/wiki-publisher.oxt
+         install -D -m644 minimizer/sun-presentation-minimizer.oxt $PKG/usr/lib/openoffice/share/extension/install/sun-presentation-minimizer.oxt
+         install -D -m644 presenter/presenter-screen.oxt $PKG/usr/lib/openoffice/share/extension/install/presenter-screen.oxt
+         install -D -m644 pdfimport/pdfimport.oxt $PKG/usr/lib/openoffice/share/extension/install/pdfimport.oxt
+       popd
+        
+        # prepare filesystem entries
+        mkdir -p $PKG/usr/{bin,share/applications}
+        mkdir -p $PKG/usr/share/icons/{hicolor,locolor}
+
+        # install shortcuts
+        mv $PKG/usr/lib/openoffice/share/xdg/*.desktop  $PKG/usr/share/applications
+        # add startcenter desktop file
+        install -D -m644 $SRC/startcenter.desktop $PKG/usr/share/applications/startcenter.desktop
+
+        cd $PKG/usr/share/applications
+        sed -i -e 's|Exec=openoffice.org3|Exec=/usr/bin/soffice|g' *.desktop
+        sed -i -e 's|Exec=/usr/bin/soffice-printeradmin|Exec=/usr/bin/spadmin|g' printeradmin.desktop
+        # fix exec commands in shortcuts for Xfce menu
+        sed -i -e 's|base %U|base|g' base.desktop
+        sed -i -e 's|calc %U|calc|g' calc.desktop
+        sed -i -e 's|draw %U|draw|g' draw.desktop
+        sed -i -e 's|impress %U|impress|g' impress.desktop
+        sed -i -e 's|math %U|math|g' math.desktop
+        sed -i -e 's|writer %U|writer|g' writer.desktop
+        # remove quickstarter, we disabled it above
+        rm -rf $PKG/usr/share/applications/qstart.desktop
+        # fix icons in desktop files
+        sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop
+
+        # install icons
+        cd $SRC/$OOdir/sysui/desktop/icons
+        cp -a -v hicolor/*x* $PKG/usr/share/icons/hicolor
+        cp -a -v locolor/*x* $PKG/usr/share/icons/locolor
+
+        # just in case icon calc is used by calculator :)
+        find $PKG/usr/share/icons -type d -name apps -exec mv {}/calc.png  {}/ooocalc.png \;
+        sed -i -e 's|Icon=calc|Icon=ooocalc|g' $PKG/usr/share/applications/calc.desktop # already done above
+
+        # fix ownership and permissions
+        chown root.root -R $PKG/
+        chmod +rX -R $PKG/usr
+
+        # set desktop variable to force gtk/gnome vcl usage
+        install -m755 -d $PKG/etc/profile.d
+        install -m755 $PKG/openoffice.profile $PKG/etc/profile.d/openoffice.sh
+
+        # make symlinks
+        cd $PKG/usr/bin
+        ln -s /usr/lib/openoffice/program/soffice soffice
+        ln -s /usr/lib/openoffice/program/spadmin spadmin
+
+        # link the mozilla-plugin
+        mkdir -p $PKG/usr/lib/mozilla/plugins/
+        cd $PKG/usr/lib/mozilla/plugins/
+        ln -v -s /usr/lib/openoffice/program/libnpsoplugin.so .
+}
+
diff --git a/extra/openoffice-3.2/buildfix-gcc44.diff b/extra/openoffice-3.2/buildfix-gcc44.diff
new file mode 100644
index 000000000..01520a70e
--- /dev/null
+++ b/extra/openoffice-3.2/buildfix-gcc44.diff
@@ -0,0 +1,10 @@
+--- oox/source/token/tokenmap.cxx	2009-09-28 06:35:40.000000000 +0000
++++ oox/source/token/tokenmap.cxx.new	2009-09-28 10:12:00.996437647 +0000
+@@ -33,6 +33,7 @@
+ #include <rtl/string.hxx>
+ #include "tokens.hxx"
+ #include "oox/helper/containerhelper.hxx"
++#include <string.h>
+ 
+ using ::rtl::OString;
+ using ::rtl::OUString;
diff --git a/extra/openoffice-3.2/buildfix_FormulaMissingHeader.diff b/extra/openoffice-3.2/buildfix_FormulaMissingHeader.diff
new file mode 100644
index 000000000..85c046b34
--- /dev/null
+++ b/extra/openoffice-3.2/buildfix_FormulaMissingHeader.diff
@@ -0,0 +1,10 @@
+--- formula/inc/formula/tokenarray.hxx	2009-01-17 00:12:44.000000000 +0000
++++ formula/inc/formula/tokenarray.hxx.new	2009-01-17 17:10:20.850652556 +0000
+@@ -35,6 +35,7 @@
+ #include "formula/ExternalReferenceHelper.hxx"
+ #include <tools/solar.h>
+ #include <com/sun/star/sheet/FormulaToken.hpp>
++#include <limits.h>
+ 
+ namespace formula
+ {
diff --git a/extra/openoffice-3.2/buildfix_system_db48.diff b/extra/openoffice-3.2/buildfix_system_db48.diff
new file mode 100644
index 000000000..c7378fb7a
--- /dev/null
+++ b/extra/openoffice-3.2/buildfix_system_db48.diff
@@ -0,0 +1,11 @@
+--- configure.in	2009-08-25 15:10:12.000000000 +0000
++++ configure.in.new	2009-09-27 17:43:11.207515081 +0000
+@@ -3626,7 +3626,7 @@
+         ], []
+     )
+     AC_MSG_CHECKING([whether db is at least 4.1])
+-    for v in `seq 1 7`; do
++    for v in `seq 1 8`; do
+        AC_TRY_RUN([
+ #include <db.h>
+ 
diff --git a/extra/openoffice-3.2/default-no-startup-wizard.diff b/extra/openoffice-3.2/default-no-startup-wizard.diff
new file mode 100644
index 000000000..432c2de1a
--- /dev/null
+++ b/extra/openoffice-3.2/default-no-startup-wizard.diff
@@ -0,0 +1,19 @@
+--- desktop/source/migration/wizard.cxx
++++ desktop/source/migration/wizard.cxx
+@@ -121,6 +121,7 @@
+     ,m_bAutomaticUpdChk(sal_True)
+     ,m_aLicensePath( rLicensePath )
+ {
++	return;
+     // ---
+     // FreeResource();
+ //	enableState(STATE_USER, sal_False);
+@@ -383,7 +384,7 @@
+ 
+ short FirstStartWizard::Execute()
+ {
+-    return svt::RoadmapWizard::Execute();
++    return sal_True || svt::RoadmapWizard::Execute();
+ }
+ 
+ static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
diff --git a/extra/openoffice-3.2/default-system-fpicker.diff b/extra/openoffice-3.2/default-system-fpicker.diff
new file mode 100644
index 000000000..331130f98
--- /dev/null
+++ b/extra/openoffice-3.2/default-system-fpicker.diff
@@ -0,0 +1,13 @@
+--- officecfg/registry/data/org/openoffice/Office/Common.xcu
++++ officecfg/registry/data/org/openoffice/Office/Common.xcu
+@@ -576,8 +576,8 @@
+     </node>
+   </node>
+   <node oor:name="Misc">
+-    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
+-      <value>false</value>
++    <prop oor:name="UseSystemFileDialog"  install:module="UseOOoFileDialogs">
++      <value>true</value>
+     </prop>
+     <prop oor:name="UseSystemPrintDialog"  install:module="macosx">
+       <value>true</value>
diff --git a/extra/openoffice-3.2/openoffice.install b/extra/openoffice-3.2/openoffice.install
new file mode 100644
index 000000000..94a8d6432
--- /dev/null
+++ b/extra/openoffice-3.2/openoffice.install
@@ -0,0 +1,26 @@
+post_install() {
+
+gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+update-desktop-database -q
+
+echo " * check /etc/profile.d/openoffice.sh, then relogin or \"source\" the file"
+echo " * see http://wiki.archlinux.org/index.php/Openoffice"
+echo "   how to use extensions, e.g. for spell checking"
+echo "   see /usr/lib/openoffice/share/extension/install what"
+echo "   is shipped with this package"
+echo " * make sure you have installed a ttf font (ttf-dejavu recommended)"
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+update-desktop-database -q
+gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+
+# make sure everything is gone, maybe someone has installed
+# extensions for all users using unopkg --shared
+rm -rf /usr/lib/openoffice
+}
+
diff --git a/extra/openoffice-3.2/openoffice.profile b/extra/openoffice-3.2/openoffice.profile
new file mode 100644
index 000000000..fb85bcb17
--- /dev/null
+++ b/extra/openoffice-3.2/openoffice.profile
@@ -0,0 +1,2 @@
+export OOO_FORCE_DESKTOP=gnome
+#export OOO_FORCE_DESKTOP=KDE4
\ No newline at end of file
diff --git a/extra/openoffice-3.2/soffice-detect-mozilla-certificates.diff b/extra/openoffice-3.2/soffice-detect-mozilla-certificates.diff
new file mode 100644
index 000000000..b3be61bc4
--- /dev/null
+++ b/extra/openoffice-3.2/soffice-detect-mozilla-certificates.diff
@@ -0,0 +1,27 @@
+--- desktop/scripts/soffice.sh
++++ desktop/scripts/soffice.sh
+@@ -207,6 +207,24 @@
+ OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
+ export OPENOFFICE_MOZILLA_FIVE_HOME
+ 
++if [ -z "$MOZILLA_CERTIFICATE_FOLDER" ]; then
++	db=""
++	dir=""
++	for d in $HOME/.mozilla/firefox $HOME/.firefox $HOME/.thunderbird $HOME/.gnome2/epiphany/mozilla $HOME/.mozilla/default $HOME/.mozilla; do
++		if [ -z "$dir" -a -d "$d" ]; then
++			dir=$d;
++		fi;
++	done
++	if [ -n "$dir" ]; then
++		cert8=`find $dir -name "cert8.db" | head -n 1`
++		if [ -n "$cert8" ]; then
++			profiledir=`dirname "$cert8"`
++			MOZILLA_CERTIFICATE_FOLDER=$profiledir
++			export MOZILLA_CERTIFICATE_FOLDER
++		fi
++	fi
++fi
++
+ unset XENVIRONMENT
+ 
+ # uncomment line below to disable anti aliasing of fonts
diff --git a/extra/openoffice-3.2/startcenter.desktop b/extra/openoffice-3.2/startcenter.desktop
new file mode 100644
index 000000000..552f06dd5
--- /dev/null
+++ b/extra/openoffice-3.2/startcenter.desktop
@@ -0,0 +1,48 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+TryExec=ooffice
+Exec=openoffice.org3 %U
+Icon=startcenter
+Type=Application
+Categories=Office;X-SuSE-Core-Office;
+StartupNotify=false
+InitialPreference=5
+Name=OpenOffice.org 3.2
+Name[af]=OpenOffice.org 3.2
+Name[ar]=أوبن أفيس.أورج
+Name[be@latin]=OpenOffice.org 3.2
+Name[ca]=OpenOffice.org 3.2
+Name[cs]=OpenOffice.org 3.2
+Name[da]=OpenOffice.org 3.2
+Name[de]=OpenOffice.org 3.2
+Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
+Name[el]=OpenOffice.org 3.2
+Name[en_CA]=OpenOffice.org 3.2
+Name[en_GB]=OpenOffice.org 3.2
+Name[es]=OpenOffice.org 3.2
+Name[et]=OpenOffice.org 3.2
+Name[eu]=OpenOffice.org 3.2
+Name[fi]=OpenOffice.org 3.2
+Name[fr]=OpenOffice.org 3.2
+Name[gl]=OpenOffice.org 3.2
+Name[he]=OpenOffice.org 3.2
+Name[hu]=OpenOffice.org 3.2
+Name[it]=OpenOffice.org 3.2
+Name[ko]=OpenOffice.org 3.2
+Name[lt]=OpenOffice.org 3.2
+Name[nb]=OpenOffice.org 3.2
+Name[ne]=ओपनअफिस डट अर्ग
+Name[nl]=OpenOffice.org 3.2
+Name[oc]=OpenOffice.org 3.2
+Name[pl]=OpenOffice.org 3.2
+Name[ps]=اوپنافس.ورګ
+Name[pt]=OpenOffice.org 3.2
+Name[pt_BR]=OpenOffice.org 3.2
+Name[sl]=OpenOffice.org 3.2
+Name[sr]=OpenOffice.org 3.2
+Name[sr@latin]=OpenOffice.org 3.2
+Name[sv]=OpenOffice.org 3.2
+Name[vi]=OpenOffice.org 3.2
+Name[zh_CN]=OpenOffice.org 3.2
+GenericName=Office
diff --git a/extra/xmlsec/.footprint b/extra/xmlsec/.footprint
index 88a4b3ca2..4f74487b7 100644
--- a/extra/xmlsec/.footprint
+++ b/extra/xmlsec/.footprint
@@ -50,24 +50,28 @@ drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/private/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libxmlsec1-gnutls.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so -> libxmlsec1-gnutls.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so.1 -> libxmlsec1-gnutls.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so -> libxmlsec1-gnutls.so.1.2.12
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so.1 -> libxmlsec1-gnutls.so.1.2.12
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.so.1.2.12
 -rw-r--r--	root/root	usr/lib/libxmlsec1-openssl.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so -> libxmlsec1-openssl.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so.1 -> libxmlsec1-openssl.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so -> libxmlsec1-openssl.so.1.2.12
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so.1 -> libxmlsec1-openssl.so.1.2.12
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.so.1.2.12
 -rw-r--r--	root/root	usr/lib/libxmlsec1.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so -> libxmlsec1.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so.1 -> libxmlsec1.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so -> libxmlsec1.so.1.2.12
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so.1 -> libxmlsec1.so.1.2.12
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1.so.1.2.12
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-gnutls.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-openssl.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1.pc
 -rw-r--r--	root/root	usr/lib/xmlsec1Conf.sh
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/xmlsec1-config.1
+-rw-r--r--	root/root	usr/man/man1/xmlsec1.1
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/xmlsec1.m4
@@ -112,7 +116,7 @@ drwxr-xr-x	root/root	usr/share/doc/xmlsec1/api/images/
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-ref.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls.sgml
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-index.html
--rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-index.sgml
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-index.sgml (EMPTY)
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-io.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-keyinfo.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-keys.html
@@ -221,7 +225,3 @@ drwxr-xr-x	root/root	usr/share/doc/xmlsec1/images/
 drwxr-xr-x	root/root	usr/share/licenses/
 drwxr-xr-x	root/root	usr/share/licenses/xmlsec/
 -rw-r--r--	root/root	usr/share/licenses/xmlsec/COPYING
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/xmlsec1-config.1.gz
--rw-r--r--	root/root	usr/share/man/man1/xmlsec1.1.gz