cmcfixes77: merge with DEV300 m86

45 files changed, 1087 insertions, 516 deletions

diff --git a/configure b/configure
index e0b389733209..0886cbe4e90f 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -947,6 +947,9 @@ Optional Features:
   --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
                           where Gtk+ is available.
 
+  --disable-gstreamer     Determines whether to use the GStreamer media
+                          backend on platforms where GStreamer is available.
+
   --disable-systray       Determines whether to build the systray quickstarter.
 
   --enable-cairo          Determines whether to use Cairo library on
@@ -1448,7 +1451,9 @@ Optional Packages:
                           Usage: --with-build-version="Built by Jim"
 
   --with-alloc            Define which allocator to build with
-			                 (choices are oo, system, tcmalloc)
+                          (choices are oo, system, tcmalloc, jemalloc)
+
+                          Note that on FreeBSD/NetBSD system==jemalloc
 
   --with-x                use the X Window System
 
@@ -2127,6 +2132,13 @@ if test "${enable_gtk+set}" = set; then
 else
   enable_gtk=yes
 fi;
+# Check whether --enable-gstreamer or --disable-gstreamer was given.
+if test "${enable_gstreamer+set}" = set; then
+  enableval="$enable_gstreamer"
+
+else
+  enable_gstreamer=yes
+fi;
 # Check whether --enable-systray or --disable-systray was given.
 if test "${enable_systray+set}" = set; then
   enableval="$enable_systray"
@@ -3326,6 +3338,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		_os=SunOS
 		# Extract the first word of "gtar", so it can be a program name with args.
 set dummy gtar; ac_word=$2
@@ -3405,7 +3418,8 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		_os=Linux
+        test_gstreamer=yes
+        _os=Linux
 		;;
 	gnu)
 		test_cups=no
@@ -3415,6 +3429,7 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
+        test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
@@ -3423,6 +3438,7 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
 		test_cairo=yes
         test_randr=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
          { echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5
@@ -3437,6 +3453,7 @@ echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --
         test_randr=no
 		test_gtk=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -3447,6 +3464,7 @@ echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5
 echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6
 		if test -n "$with_os_version"; then
@@ -3485,6 +3503,7 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
 		test_cups=no
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
@@ -3493,6 +3512,7 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
 		test_cups=no
         test_randr=no
 		test_freetype=yes
+        test_gstreamer=yes
 	   PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
@@ -4902,7 +4922,7 @@ done
         COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`;
 fi
 COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
-echo $COMPATH
+
 GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
     echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
@@ -10519,6 +10539,203 @@ fi
 
     ALLOC="TCMALLOC";
 fi
+if test "$with_alloc" = "jemalloc"; then
+  if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
+    echo "$as_me:$LINENO: result: jemalloc" >&5
+echo "${ECHO_T}jemalloc" >&6
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -pthread"
+
+echo "$as_me:$LINENO: checking for malloc in -ljemalloc" >&5
+echo $ECHO_N "checking for malloc in -ljemalloc... $ECHO_C" >&6
+if test "${ac_cv_lib_jemalloc_malloc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljemalloc  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char malloc ();
+int
+main ()
+{
+malloc ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_jemalloc_malloc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_jemalloc_malloc=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_jemalloc_malloc" >&5
+echo "${ECHO_T}$ac_cv_lib_jemalloc_malloc" >&6
+if test $ac_cv_lib_jemalloc_malloc = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJEMALLOC 1
+_ACEOF
+
+  LIBS="-ljemalloc $LIBS"
+
+else
+  { { echo "$as_me:$LINENO: error: jemalloc not found or functional. Install the jemalloc allocator." >&5
+echo "$as_me: error: jemalloc not found or functional. Install the jemalloc allocator." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+    ALLOC="JEMALLOC";
+    CFLAGS=$save_CFLAGS
+  else
+    echo "$as_me:$LINENO: result: system" >&5
+echo "${ECHO_T}system" >&6
+    ALLOC="SYS_ALLOC";
+
+
+
+
+for ac_func in malloc realloc calloc free
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  fi
+fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
    echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -10966,7 +11183,7 @@ echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;}
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-        if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+        if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
@@ -11067,7 +11284,7 @@ echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-#         if test "$JDK" == "gcj"; then
+#         if test "$JDK" = "gcj"; then
 #             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
 #         fi
       fi
@@ -11986,10 +12203,14 @@ echo $ECHO_N "checking for rpm... $ECHO_C" >&6
           { { echo "$as_me:$LINENO: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
-       else
-	  RPM_PATH=`which $RPM`
+       elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
+          RPM_PATH=`which $RPM`
           echo "$as_me:$LINENO: result: $RPM_PATH" >&5
 echo "${ECHO_T}$RPM_PATH" >&6
+       else
+          { { echo "$as_me:$LINENO: error: cannot build packages. Try installing rpmbuild." >&5
+echo "$as_me: error: cannot build packages. Try installing rpmbuild." >&2;}
+   { (exit 1); exit 1; }; }
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
@@ -12143,14 +12364,15 @@ echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;}
 
 
 
-
 else
    echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
    EPM=NO
+   PKGFORMAT=native
 fi
 
 
+
 # Extract the first word of "gperf", so it can be a program name with args.
 set dummy gperf; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -12206,6 +12428,19 @@ echo "$as_me: error: too old, you need at least 3.0.0" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+echo "$as_me:$LINENO: checking whether to build the stax" >&5
+echo $ECHO_N "checking whether to build the stax... $ECHO_C" >&6
+if test -f "./stax/download/jsr173_1.0_api.jar"; then
+   BUILD_STAX=NO
+   echo "$as_me:$LINENO: result: no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&5
+echo "${ECHO_T}no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&6
+else
+   BUILD_STAX=YES
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+fi
+
+
 echo "$as_me:$LINENO: checking whether to build the ODK" >&5
 echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
@@ -13901,7 +14136,7 @@ fi
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
    test "$with_system_libxslt" != "no"; then
     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" == "no"; then
+      test "$with_system_libxml" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
@@ -13911,7 +14146,7 @@ fi
 if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
    test "$with_system_libxml" != "no"; then
     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" == "no"; then
+      test "$with_system_libxslt" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
@@ -14935,25 +15170,25 @@ if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then
    LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
 else
 
-              echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5
-echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6
-if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then
+              echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/lucene-core.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_lucene_core_jar+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "/usr/share/java/lucene.jar"; then
-  ac_cv_file__usr_share_java_lucene_jar=yes
+if test -r "/usr/share/java/lucene-core.jar"; then
+  ac_cv_file__usr_share_java_lucene_core_jar=yes
 else
-  ac_cv_file__usr_share_java_lucene_jar=no
+  ac_cv_file__usr_share_java_lucene_core_jar=no
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
-echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6
-if test $ac_cv_file__usr_share_java_lucene_jar = yes; then
-   LUCENE_CORE_JAR=/usr/share/java/lucene.jar
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_jar" >&6
+if test $ac_cv_file__usr_share_java_lucene_core_jar = yes; then
+   LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar
 else
    { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5
 echo "$as_me: error: lucene-core.jar replacement not found" >&2;}
@@ -15074,6 +15309,26 @@ echo "$as_me: error: lucene-analyzers.jar not found." >&2;}
 fi
 
         fi
+        echo "$as_me:$LINENO: checking whether lucene is version 2.x" >&5
+echo $ECHO_N "checking whether lucene is version 2.x... $ECHO_C" >&6
+        export LUCENE_CORE_JAR
+        if $PERL -e 'use Archive::Zip;
+            my $file = "$ENV{'LUCENE_CORE_JAR'}";
+            my $zip = Archive::Zip->new( $file );
+            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+            if ( $mf =~ m/Specification-Version: 2.*/ ) {
+                exit 0;
+            } else {
+                exit 1;
+            }'; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+         else
+            { { echo "$as_me:$LINENO: error: no, you need lucene 2" >&5
+echo "$as_me: error: no, you need lucene 2" >&2;}
+   { (exit 1); exit 1; }; }
+         fi
+
 else
     echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
@@ -15570,35 +15825,35 @@ echo "$as_me: error: hsqldb.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-        echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5
-echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking whether hsqldb is 1.8.0.x" >&5
+echo $ECHO_N "checking whether hsqldb is 1.8.0.x... $ECHO_C" >&6
         export HSQLDB_JAR
         if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
             my $zip = Archive::Zip->new( $file );
             my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-	    if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
-	    	push @l, split(/\n/, $mf);
-	    	foreach my $line (@l) {
-		    if ($line =~ m/Specification-Version:/) {
-		        ($t, $version) = split (/:/,$line);
-		        $version =~ s/^\s//;
-		        ($a, $b, $c, $d) = split (/\./,$version);
-		        if (($c == "0" && $d > "8") || $c > 0)  {
-		            exit 0;
-		        } else {
-		            exit 1;
-		        }
-		    }
-		}
-	    } else {
-	        exit 1;
+            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
+               push @l, split(/\n/, $mf);
+               foreach my $line (@l) {
+                  if ($line =~ m/Specification-Version:/) {
+                      ($t, $version) = split (/:/,$line);
+                      $version =~ s/^\s//;
+                      ($a, $b, $c, $d) = split (/\./,$version);
+                      if ($c == "0" && $d > "8")  {
+                          exit 0;
+                      } else {
+                          exit 1;
+                      }
+                  }
+               }
+            } else {
+                exit 1;
             }'; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
          else
-            { { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5
-echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;}
+            { { echo "$as_me:$LINENO: error: no, you need hsqldb >= 1.8.0.9 but < 1.8.1" >&5
+echo "$as_me: error: no, you need hsqldb >= 1.8.0.9 but < 1.8.1" >&2;}
    { (exit 1); exit 1; }; }
          fi
 else
@@ -16437,8 +16692,8 @@ fi
 if test $ac_cv_header_boost_spirit_include_classic_core_hpp = yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&5
-echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&2;}
+  { { echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" >&5
+echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -18135,7 +18390,7 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;}
 
     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
     #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" == "libxul"; then
+    if test "$MOZ_FLAVOUR" = "libxul"; then
         MOZ_FLAVOUR="mozilla"
     fi
 
@@ -19374,7 +19629,7 @@ fi
 
 echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
 echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&6
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
+if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
     ENABLE_GRAPHITE="TRUE"
@@ -24196,6 +24451,155 @@ echo "$as_me: error: lpsolve headers not found." >&2;}
 fi
 
 
+    # some systems need this. Like Ubuntu....
+
+echo "$as_me:$LINENO: checking for floor in -lm" >&5
+echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
+if test "${ac_cv_lib_m_floor+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char floor ();
+int
+main ()
+{
+floor ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_m_floor=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_m_floor=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
+echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
+if test $ac_cv_lib_m_floor = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+
+
+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+  LIBS="-ldl $LIBS"
+
+fi
+
 
 echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5
 echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6
@@ -25415,14 +25819,12 @@ echo "$as_me: error: Configure did not find ml.exe assembler." >&2;}
        with_asm_home="ASM_IN_PATH"
     fi
   fi
-else
-	with_asm_home="NO_ASM_HOME"
-fi
-ASM_HOME="$with_asm_home"
-if test -n "$ASM_HOME"; then
   echo "$as_me:$LINENO: result: $ASM_HOME" >&5
 echo "${ECHO_T}$ASM_HOME" >&6
+else
+  with_asm_home="NO_ASM_HOME"
 fi
+ASM_HOME="$with_asm_home"
 
 
 if test -z "$with_zip_home"; then
@@ -26341,6 +26743,126 @@ fi
 
 
 
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test "$test_gstreamer" = "yes"; then
+    echo "$as_me:$LINENO: checking whether to build the GStreamer media backend" >&5
+echo $ECHO_N "checking whether to build the GStreamer media backend... $ECHO_C" >&6
+    if test "x$enable_gstreamer" != "xno" ; then
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " >&5
+echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5
+echo $ECHO_N "checking GSTREAMER_CFLAGS... $ECHO_C" >&6
+            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
+            echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5
+echo "${ECHO_T}$GSTREAMER_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5
+echo $ECHO_N "checking GSTREAMER_LIBS... $ECHO_C" >&6
+            GSTREAMER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
+            echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5
+echo "${ECHO_T}$GSTREAMER_LIBS" >&6
+        else
+            GSTREAMER_CFLAGS=""
+            GSTREAMER_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     { { echo "$as_me:$LINENO: error: requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" >&5
+echo "$as_me: error: requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+        ENABLE_GSTREAMER="TRUE"
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    else
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    fi
+fi
+
+
+
+
+
+
 ENABLE_CAIRO=""
 BUILD_PIXMAN=""
 SYSTEM_CAIRO=""
@@ -27059,7 +27581,7 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
   echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
 echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6
   if test -n "$with_system_servlet_api"; then
@@ -27123,9 +27645,9 @@ echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)
   fi
   echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
 echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
-  if test "$with_system_jfreereport" == "yes"; then
-   	SYSTEM_JFREEREPORT=YES
-  	   echo "$as_me:$LINENO: result: external" >&5
+  if test "$with_system_jfreereport" = "yes"; then
+      SYSTEM_JFREEREPORT=YES
+      echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
@@ -28537,7 +29059,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_incdirs="/usr/include $x_includes"
    kde_libdirs="/usr/lib $x_libraries"
 
-   if test "$build_cpu" == "x86_64" ; then
+   if test "$build_cpu" = "x86_64" ; then
       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
@@ -29352,32 +29874,6 @@ else
     export ANT_HOME
   fi
 
-  ant_minver=1.6.0
-  # update for more extensions...
-  if test "$ENABLE_MEDIAWIKI" = "YES"; then
-    ant_minver=1.7.0
-  fi
-  ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-  echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
-echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6
-  ant_version=`$ANT -version | $AWK '{ print $4; }'`
-  ant_version_major=`echo $ant_version | cut -d. -f1`
-  ant_version_minor=`echo $ant_version | cut -d. -f2`
-echo "configure: ant_version $ant_version " >&5
-echo "configure: ant_version_major $ant_version_major " >&5
-echo "configure: ant_version_minor $ant_version_minor " >&5
-  if test "$ant_version_major" -ge "2"; then
-  	echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-echo "${ECHO_T}yes, $ant_version" >&6
-  elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-  	echo "$as_me:$LINENO: result: yes, $ant_version" >&5
-echo "${ECHO_T}yes, $ant_version" >&6
-  else
-  	{ { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5
-echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
   echo "$as_me:$LINENO: checking if $ANT works" >&5
 echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6
 cat > conftest.java << EOF
@@ -29468,6 +29964,33 @@ fi
 
 fi
 
+ant_minver=1.6.0
+# update for more extensions...
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
+  ant_minver=1.7.0
+fi
+ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+
+echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5
+echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6
+ant_version=`$ANT -version | $AWK '{ print $4; }'`
+ant_version_major=`echo $ant_version | cut -d. -f1`
+ant_version_minor=`echo $ant_version | cut -d. -f2`
+echo "configure: ant_version $ant_version " >&5
+echo "configure: ant_version_major $ant_version_major " >&5
+echo "configure: ant_version_minor $ant_version_minor " >&5
+if test "$ant_version_major" -ge "2"; then
+   echo "$as_me:$LINENO: result: yes, $ant_version" >&5
+echo "${ECHO_T}yes, $ant_version" >&6
+elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
+   echo "$as_me:$LINENO: result: yes, $ant_version" >&5
+echo "${ECHO_T}yes, $ant_version" >&6
+else
+   { { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5
+echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
 echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5
 echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6
@@ -29475,18 +29998,18 @@ rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
     public class conftest {
-	int testmethod(int a, int b) {
+        int testmethod(int a, int b) {
             return a + b;
-	}
+        }
     }
 EOF
 
 cat > conftest.xml << EOF
     <project name="conftest" default="conftest">
-	<target name="conftest" depends="copytest">
+        <target name="conftest" depends="copytest">
             <javac srcdir="." includes="conftest.java">
-	    </javac>
-	</target>
+            </javac>
+        </target>
         <target name="copytest">
              <copy todir="confdir">
                  <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
@@ -29699,12 +30222,12 @@ fi
 echo "$as_me:$LINENO: checking build verbosity" >&5
 echo $ECHO_N "checking build verbosity... $ECHO_C" >&6
 if test -n "$enable_verbose"; then
-   if test "$enable_verbose" == "yes"; then
+   if test "$enable_verbose" = "yes"; then
       VERBOSE="TRUE"
       echo "$as_me:$LINENO: result: high" >&5
 echo "${ECHO_T}high" >&6
    fi
-   if test "$enable_verbose" == "no"; then
+   if test "$enable_verbose" = "no"; then
       VERBOSE="FALSE"
       echo "$as_me:$LINENO: result: low" >&5
 echo "${ECHO_T}low" >&6
@@ -30514,9 +31037,10 @@ s,@EPM@,$EPM,;t t
 s,@DPKG@,$DPKG,;t t
 s,@PKGMK@,$PKGMK,;t t
 s,@BUILD_EPM@,$BUILD_EPM,;t t
-s,@PKGFORMAT@,$PKGFORMAT,;t t
 s,@RPM@,$RPM,;t t
+s,@PKGFORMAT@,$PKGFORMAT,;t t
 s,@GPERF@,$GPERF,;t t
+s,@BUILD_STAX@,$BUILD_STAX,;t t
 s,@MINGWCXX@,$MINGWCXX,;t t
 s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t
 s,@MINGWSTRIP@,$MINGWSTRIP,;t t
@@ -30700,6 +31224,9 @@ s,@GIO_LIBS@,$GIO_LIBS,;t t
 s,@ENABLE_GIO@,$ENABLE_GIO,;t t
 s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t
 s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t
+s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t
+s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t
+s,@ENABLE_GSTREAMER@,$ENABLE_GSTREAMER,;t t
 s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
 s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
 s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t
diff --git a/configure.in b/configure.in
index 0a90dcec6f72..2925ad033aba 100644
--- a/configure.in
+++ b/configure.in
@@ -198,6 +198,10 @@ AC_ARG_ENABLE(gtk,
 [  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
                           where Gtk+ is available.
 ],,enable_gtk=yes)
+AC_ARG_ENABLE(gstreamer,
+[  --disable-gstreamer     Determines whether to use the GStreamer media
+                          backend on platforms where GStreamer is available.
+],,enable_gstreamer=yes)
 AC_ARG_ENABLE(systray,
 [  --disable-systray       Determines whether to build the systray quickstarter.
 ],,enable_systray=yes)
@@ -816,7 +820,9 @@ AC_ARG_WITH(build-version,
 ],with_build_version=$withval)
 AC_ARG_WITH(alloc,
 [  --with-alloc            Define which allocator to build with
-			                 (choices are oo, system, tcmalloc)
+                          (choices are oo, system, tcmalloc, jemalloc)
+
+                          Note that on FreeBSD/NetBSD system==jemalloc
 ],,)
 AC_ARG_ENABLE(verbose,
 [  --enable-verbose        Increase build verbosity.
@@ -930,6 +936,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		_os=SunOS
 		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
 		if test -z "$GNUTAR"; then
@@ -964,7 +971,8 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		_os=Linux
+        test_gstreamer=yes
+        _os=Linux	
 		;;
 	gnu)
 		test_cups=no
@@ -974,6 +982,7 @@ case "$build_os" in
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
+        test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
@@ -982,6 +991,7 @@ case "$build_os" in
 		test_cairo=yes
         test_randr=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
          AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
@@ -995,6 +1005,7 @@ case "$build_os" in
         test_randr=no
 		test_gtk=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -1005,6 +1016,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		AC_MSG_CHECKING([the FreeBSD operating system release])
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
@@ -1039,6 +1051,7 @@ case "$build_os" in
 		test_cups=no
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
@@ -1047,6 +1060,7 @@ case "$build_os" in
 		test_cups=no
         test_randr=no
 		test_freetype=yes
+        test_gstreamer=yes
 	   PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
@@ -1436,7 +1450,7 @@ if test "$COMPATH" = "." ; then
     COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
 fi
 COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
-echo $COMPATH
+
 dnl ===================================================================
 dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
@@ -2689,6 +2703,21 @@ if test "$with_alloc" = "tcmalloc"; then
         [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
     ALLOC="TCMALLOC";
 fi
+if test "$with_alloc" = "jemalloc"; then
+  if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
+    AC_MSG_RESULT(jemalloc)
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -pthread"
+    AC_CHECK_LIB(jemalloc, malloc, [],
+        [AC_MSG_ERROR(jemalloc not found or functional. Install the jemalloc allocator.)], [])
+    ALLOC="JEMALLOC";
+    CFLAGS=$save_CFLAGS
+  else
+    AC_MSG_RESULT([system])
+    ALLOC="SYS_ALLOC";
+    AC_CHECK_FUNCS([malloc realloc calloc free])
+  fi
+fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
    AC_MSG_RESULT([internal])
 fi
@@ -2980,7 +3009,7 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
     dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
-    if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+    if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 [import java.io.File;
@@ -3068,7 +3097,7 @@ _ACEOF
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-#         if test "$JDK" == "gcj"; then
+#         if test "$JDK" = "gcj"; then
 #             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
 #         fi
       fi
@@ -3343,9 +3372,11 @@ msi - Windows .msi
        done
        if test -z "$RPM" ; then
           AC_MSG_ERROR([not found])
-       else
-	  RPM_PATH=`which $RPM`
+       elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
+          RPM_PATH=`which $RPM`
           AC_MSG_RESULT([$RPM_PATH])
+       else
+          AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.])
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
@@ -3399,15 +3430,16 @@ msi - Windows .msi
       fi
    fi
    AC_SUBST(BUILD_EPM)
-   AC_SUBST(PKGFORMAT)
    AC_SUBST(RPM)
    AC_SUBST(DPKG)
    AC_SUBST(PKGMK)
 else
    AC_MSG_RESULT([no])
    EPM=NO
+   PKGFORMAT=native
 fi
 AC_SUBST(EPM)
+AC_SUBST(PKGFORMAT)
 
 dnl ===================================================================
 dnl Check for gperf
@@ -3424,6 +3456,19 @@ else
 fi
 
 dnl ===================================================================
+dnl Check for building stax
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build the stax])
+if test -f "./stax/download/jsr173_1.0_api.jar"; then
+   BUILD_STAX=NO
+   AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar])
+else
+   BUILD_STAX=YES
+   AC_MSG_RESULT([yes])
+fi
+AC_SUBST(BUILD_STAX)
+
+dnl ===================================================================
 dnl Check for building ODK
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the ODK])
@@ -3652,7 +3697,7 @@ AC_SUBST(USE_FT_EMBOLDEN)
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
    test "$with_system_libxslt" != "no"; then
     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" == "no"; then
+      test "$with_system_libxml" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
@@ -3662,7 +3707,7 @@ fi
 if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
    test "$with_system_libxml" != "no"; then
     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" == "no"; then
+      test "$with_system_libxslt" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
@@ -3817,8 +3862,8 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
           AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar, 
             [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
             [
-              AC_CHECK_FILE(/usr/share/java/lucene.jar, 
-                [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
+              AC_CHECK_FILE(/usr/share/java/lucene-core.jar, 
+                [ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
                 [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
               )
             ]
@@ -3842,6 +3887,22 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
           AC_CHECK_FILE($LUCENE_CORE_JAR, [],
                [ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
         fi
+        AC_MSG_CHECKING([whether lucene is version 2.x])
+        export LUCENE_CORE_JAR
+        if $PERL -e 'use Archive::Zip;
+            my $file = "$ENV{'LUCENE_CORE_JAR'}";
+            my $zip = Archive::Zip->new( $file );
+            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+            if ( $mf =~ m/Specification-Version: 2.*/ ) {
+                exit 0;
+            } else {
+                exit 1;
+            }'; then
+            AC_MSG_RESULT([yes])
+         else
+            AC_MSG_ERROR([no, you need lucene 2])
+         fi
+
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LUCENE=NO
@@ -3979,32 +4040,32 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
         fi
         AC_CHECK_FILE($HSQLDB_JAR, [],
                [AC_MSG_ERROR(hsqldb.jar not found.)], [])
-        AC_MSG_CHECKING([whether hsqldb is >= 1.8.0.9])
+        AC_MSG_CHECKING([whether hsqldb is 1.8.0.x])
         export HSQLDB_JAR
         if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
             my $zip = Archive::Zip->new( $file );
             my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-	    if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
-	    	push @l, split(/\n/, $mf);
-	    	foreach my $line (@l) {
-		    if ($line =~ m/Specification-Version:/) {
-		        ($t, $version) = split (/:/,$line);
-		        $version =~ s/^\s//;
-		        ($a, $b, $c, $d) = split (/\./,$version);
-		        if (($c == "0" && $d > "8") || $c > 0)  {
-		            exit 0;
-		        } else {
-		            exit 1;
-		        }
-		    }
-		}
-	    } else {
-	        exit 1;
+            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
+               push @l, split(/\n/, $mf);
+               foreach my $line (@l) {
+                  if ($line =~ m/Specification-Version:/) {
+                      ($t, $version) = split (/:/,$line);
+                      $version =~ s/^\s//;
+                      ($a, $b, $c, $d) = split (/\./,$version);
+                      if ($c == "0" && $d > "8")  {
+                          exit 0;
+                      } else {
+                          exit 1;
+                      }
+                  }
+               }
+            } else {
+                exit 1;
             }'; then
             AC_MSG_RESULT([yes])
          else
-            AC_MSG_ERROR([no, hsqldb >= 1.8.0.9 is needed])
+            AC_MSG_ERROR([no, you need hsqldb >= 1.8.0.9 but < 1.8.1])
          fi
 else
     AC_MSG_RESULT([internal])
@@ -4211,7 +4272,7 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \
    AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
        [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
    AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
-       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.38)], [])
+       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
    AC_CHECK_HEADER(boost/function.hpp, [],
        [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
 
@@ -4428,7 +4489,7 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.])
 
     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
     #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" == "libxul"; then
+    if test "$MOZ_FLAVOUR" = "libxul"; then
         MOZ_FLAVOUR="mozilla"
     fi
 
@@ -4689,7 +4750,7 @@ dnl Graphite
 dnl ===================================================================
 
 AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
+if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
     AC_MSG_RESULT([yes])
     ENABLE_GRAPHITE="TRUE"
     AC_MSG_CHECKING([which graphite to use])
@@ -5133,6 +5194,9 @@ if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
     SYSTEM_LPSOLVE=YES
     AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
        [ AC_MSG_ERROR(lpsolve headers not found.)], [])
+    # some systems need this. Like Ubuntu....
+    AC_CHECK_LIB(m, floor)
+    AC_CHECK_LIB(dl, dlopen)
     AC_CHECK_LIB(lpsolve55, make_lp, ,
         [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
 else
@@ -5478,13 +5542,11 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        with_asm_home="ASM_IN_PATH"
     fi
   fi
+  AC_MSG_RESULT([$ASM_HOME])
 else
-	with_asm_home="NO_ASM_HOME"
+  with_asm_home="NO_ASM_HOME"
 fi
 ASM_HOME="$with_asm_home"
-if test -n "$ASM_HOME"; then
-  AC_MSG_RESULT([$ASM_HOME])
-fi
 AC_SUBST(ASM_HOME)
  
 dnl ===================================================================
@@ -5732,6 +5794,29 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
 dnl ===================================================================
+dnl Check whether the GStreamer libraries are available.
+dnl ===================================================================
+
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test "$test_gstreamer" = "yes"; then
+    AC_MSG_CHECKING([whether to build the GStreamer media backend])
+    if test "x$enable_gstreamer" != "xno" ; then
+        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
+        ENABLE_GSTREAMER="TRUE"
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+fi
+AC_SUBST(ENABLE_GSTREAMER)
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
+
+
+dnl ===================================================================
 dnl Check whether the Cairo libraries are available.
 dnl ===================================================================
 
@@ -5901,7 +5986,7 @@ else
 fi
 AC_SUBST(ENABLE_MEDIAWIKI)
 
-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
   AC_MSG_CHECKING([which Servlet API Jar to use])
   if test -n "$with_system_servlet_api"; then
     AC_MSG_RESULT([external])
@@ -5931,9 +6016,9 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
     AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
   fi
   AC_MSG_CHECKING([which jfreereport libs to use])
-  if test "$with_system_jfreereport" == "yes"; then
-   	SYSTEM_JFREEREPORT=YES
-  	   AC_MSG_RESULT([external])
+  if test "$with_system_jfreereport" = "yes"; then
+      SYSTEM_JFREEREPORT=YES
+      AC_MSG_RESULT([external])
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
       fi
@@ -6338,7 +6423,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_incdirs="/usr/include $x_includes"
    kde_libdirs="/usr/lib $x_libraries"
    
-   if test "$build_cpu" == "x86_64" ; then
+   if test "$build_cpu" = "x86_64" ; then
       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
@@ -6638,27 +6723,6 @@ else
     export ANT_HOME
   fi
 
-  ant_minver=1.6.0
-  # update for more extensions...
-  if test "$ENABLE_MEDIAWIKI" = "YES"; then
-    ant_minver=1.7.0
-  fi
-  ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-  AC_MSG_CHECKING([whether ant is >= $ant_minver])
-  ant_version=`$ANT -version | $AWK '{ print $4; }'`
-  ant_version_major=`echo $ant_version | cut -d. -f1`
-  ant_version_minor=`echo $ant_version | cut -d. -f2`
-echo "configure: ant_version $ant_version " >&5
-echo "configure: ant_version_major $ant_version_major " >&5
-echo "configure: ant_version_minor $ant_version_minor " >&5
-  if test "$ant_version_major" -ge "2"; then
-  	AC_MSG_RESULT([yes, $ant_version])
-  elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-  	AC_MSG_RESULT([yes, $ant_version])
-  else
-  	AC_MSG_ERROR([no, you need at least ant >= $ant_minver])
-  fi
   AC_MSG_CHECKING([if $ANT works])
 cat > conftest.java << EOF
     public class conftest {
@@ -6739,24 +6803,46 @@ fi
 AC_SUBST(ANT_LIB)
 fi
 
+ant_minver=1.6.0
+# update for more extensions...
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
+  ant_minver=1.7.0
+fi
+ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+
+AC_MSG_CHECKING([whether ant is >= $ant_minver])
+ant_version=`$ANT -version | $AWK '{ print $4; }'`
+ant_version_major=`echo $ant_version | cut -d. -f1`
+ant_version_minor=`echo $ant_version | cut -d. -f2`
+echo "configure: ant_version $ant_version " >&5
+echo "configure: ant_version_major $ant_version_major " >&5
+echo "configure: ant_version_minor $ant_version_minor " >&5
+if test "$ant_version_major" -ge "2"; then
+   AC_MSG_RESULT([yes, $ant_version])
+elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
+   AC_MSG_RESULT([yes, $ant_version])
+else
+   AC_MSG_ERROR([no, you need at least ant >= $ant_minver])
+fi
+
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
 AC_MSG_CHECKING([whether ant supports mapper type="regexp"])
 rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
     public class conftest {
-	int testmethod(int a, int b) {
+        int testmethod(int a, int b) {
             return a + b;
-	}
+        }
     }
 EOF
 
 cat > conftest.xml << EOF
     <project name="conftest" default="conftest">
-	<target name="conftest" depends="copytest">
+        <target name="conftest" depends="copytest">
             <javac srcdir="." includes="conftest.java">
-	    </javac>
-	</target>
+            </javac>
+        </target>
         <target name="copytest">
              <copy todir="confdir">
                  <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
@@ -6925,11 +7011,11 @@ AC_SUBST(ENABLE_LAYOUT)
 # ===================================================================
 AC_MSG_CHECKING([build verbosity])
 if test -n "$enable_verbose"; then
-   if test "$enable_verbose" == "yes"; then
+   if test "$enable_verbose" = "yes"; then
       VERBOSE="TRUE"
       AC_MSG_RESULT([high])
    fi
-   if test "$enable_verbose" == "no"; then
+   if test "$enable_verbose" = "no"; then
       VERBOSE="FALSE"
       AC_MSG_RESULT([low])
    fi
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index dea5e9767a6e..21f7fe7726a5 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -132,7 +132,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7fcb566af0e3..ec904cd5e904 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -620,7 +620,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_255]
-en-US = "All program features will be installed. (Requires the most disk space.)"
+en-US = "The main components will be installed. Recommended for most users."
 
 [OOO_CONTROL_256]
 en-US = "Choose which program features you want installed and where they will be installed. Recommended for advanced users."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index da2d44cdb983..24b51774bacb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -8,7 +8,7 @@ en-US = "{&MSSansBold8}Re&pair"
 en-US = "{&MSSansBold8}&Remove"
 
 [OOO_RADIOBUTTON_4]
-en-US = "{&MSSansBold8}&Complete"
+en-US = "{&MSSansBold8}&Typical"
 
 [OOO_RADIOBUTTON_5]
 en-US = "{&MSSansBold8}Cu&stom"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 2200f4d28a3a..56bf6b92d757 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -145,7 +145,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	[FILETYPEDIALOGUSED]	0	_IsSetupTypeMin <> "Custom"	5
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	6
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 332945b50bdb..49407d4770da 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -133,7 +133,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 332945b50bdb..49407d4770da 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -133,7 +133,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 72f4262b1c4e..19a6214f8dc6 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -210,7 +210,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .ENDIF			# "$(MAKETARGETS)"!=""
 openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -log
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 221aee9868b2..5d83c5f98baa 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,15 +4,15 @@ Globals
 	{
 		variables
 		{
-			OOOBASEVERSION 3.3
-			OOOPACKAGEVERSION 3.3.0
-			UREPACKAGEVERSION 1.7.0
+			OOOBASEVERSION 3.4
+			OOOPACKAGEVERSION 3.4.0
+			UREPACKAGEVERSION 1.8.0
 			URELAYERVERSION 1
 			BASISROOTNAME OpenOffice.org
 			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.3 
-			SERVICETAG_PRODUCTVERSION 3.3
-			SERVICETAG_PARENTNAME OpenOffice.org 3.3 
+			SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 
+			SERVICETAG_PRODUCTVERSION 3.4
+			SERVICETAG_PARENTNAME OpenOffice.org 3.4 
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 			HIDELICENSEDIALOG 1
@@ -21,7 +21,7 @@ Globals
 			UREPACKAGEPREFIX openoffice.org
 			SOLSUREPACKAGEPREFIX openofficeorg
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
             POOLPRODUCT 1
             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
@@ -36,7 +36,7 @@ Globals
             CREATE_MSP_INSTALLSET 0
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
  			PACKAGEMAP package_names.txt,package_names_ext.txt
-			WINDOWSPATCHLEVEL 6
+			WINDOWSPATCHLEVEL 8
             OOOVENDOR Oracle
 			OOODOWNLOADNAME 1
 			STARTCENTER_LAYOUT_STYLE 0
@@ -53,7 +53,7 @@ OpenOffice
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -61,19 +61,19 @@ OpenOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
-			BASEPRODUCTVERSION 3.3
+			ABOUTBOXPRODUCTVERSION 3.4.0
+			BASEPRODUCTVERSION 3.4
             PCPFILENAME openoffice.pcp
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -88,7 +88,7 @@ OpenOffice
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooo_patchcodes.txt
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
@@ -118,7 +118,7 @@ OpenOffice_wJRE
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -126,18 +126,18 @@ OpenOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
-			BASEPRODUCTVERSION 3.3
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			ABOUTBOXPRODUCTVERSION 3.4.0
+			BASEPRODUCTVERSION 3.4
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -153,7 +153,7 @@ OpenOffice_wJRE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooo_patchcodes.txt
 			JAVAPRODUCT 1
 			DOWNLOADBANNER	ooobanner.bmp
@@ -183,7 +183,7 @@ OpenOffice_Dev
 		variables
 		{
 			PRODUCTNAME OOo-dev
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -193,22 +193,22 @@ OpenOffice_Dev
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
-			BASEPRODUCTVERSION 3.3
+			ABOUTBOXPRODUCTVERSION 3.4.0
+			BASEPRODUCTVERSION 3.4
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
 			REGISTRYLAYERNAME LayerDev
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -224,7 +224,7 @@ OpenOffice_Dev
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooodev_patchcodes.txt
 			CODEFILENAME codes_ooodev.txt
 			DOWNLOADBANNER	ooobanner.bmp
@@ -257,8 +257,8 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 1.7
-            PACKAGEVERSION 1.7
+            PRODUCTVERSION 1.8
+            PACKAGEVERSION 1.8
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
@@ -280,7 +280,7 @@ URE
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
 			PACKAGEMAP package_names_ext.txt
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
         }
@@ -299,14 +299,14 @@ OpenOffice_SDK
         variables
         {
             PRODUCTNAME OpenOffice.org
-            PRODUCTVERSION 3.3
+            PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.3.0
+            PACKAGEVERSION 3.4.0
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
             POOLPRODUCT 0
@@ -344,7 +344,7 @@ OpenOffice_Dev_SDK
         variables
         {
             PRODUCTNAME OOo-dev
-            PRODUCTVERSION 3.3
+            PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
@@ -353,7 +353,7 @@ OpenOffice_Dev_SDK
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.3.0
+            PACKAGEVERSION 3.4.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX ooobasis-dev
             UREPACKAGEPREFIX ooodev
@@ -395,7 +395,7 @@ BrOffice
 		variables
 		{
 			PRODUCTNAME BrOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -403,22 +403,22 @@ BrOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.4.0
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
 			NATIVEPROGRESS
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -433,7 +433,7 @@ BrOffice
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			CODEFILENAME codes_broo.txt
 			PATCHCODEFILE bro_patchcodes.txt
 			DOWNLOADBANNER	brobanner.bmp
@@ -465,7 +465,7 @@ BrOffice_wJRE
 		variables
 		{
 			PRODUCTNAME BrOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -473,22 +473,22 @@ BrOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.4.0
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
 			NATIVEPROGRESS
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -504,7 +504,7 @@ BrOffice_wJRE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			CODEFILENAME codes_broo.txt
 			PATCHCODEFILE bro_patchcodes.txt
 			JAVAPRODUCT 1
@@ -536,7 +536,7 @@ BrOffice_Dev
 		variables
 		{
 			PRODUCTNAME BrOo-dev
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -546,21 +546,21 @@ BrOffice_Dev
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.4.0
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
 			REGISTRYLAYERNAME LayerDevBroffice
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
 			SERVICESPROJEKT 1
@@ -576,7 +576,7 @@ BrOffice_Dev
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE brodev_patchcodes.txt
 			CODEFILENAME codes_broodev.txt
 			DOWNLOADBANNER	brobanner.bmp
diff --git a/ooo.lst b/ooo.lst
index 0887e5981d4f..0c10e39f8f7c 100644..100755
--- a/ooo.lst
+++ b/ooo.lst
@@ -1,5 +1,5 @@
 http://hg.services.openoffice.org/binaries
-05a0ece1372392a2cf310ebb96333025-openssl-0.9.8l.tar.gz
+63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
 68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
@@ -28,7 +28,7 @@ ef9ab6c1740682fbd730606d5f6922e6-liberation-fonts-ttf-1.05.3.20100427.zip
 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
 5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
-6244eb0b6e2647ee50470951fa6efb47-nss_3_12_5.tar.gz
+b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
 67b42915c8432abf0a922438f00860a2-libxml.zip
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 48a1ae148777..91c74499a916 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -424,6 +424,15 @@ End
         Value = " "; \
     End
 
+#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
+    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
+        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = " "; \
+    End
+
 #define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     RegistryItem gid_Regitem__##name \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
@@ -501,7 +510,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -511,7 +520,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -530,7 +539,7 @@ End
 
 #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
-    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
     CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     REGISTRY_ENTRY_DOC(name,modid,disp_name) \
     REGISTRY_ENTRY_ICON(name,modid,icon_id) \
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index d7cba78f6101..ca3c94b759e0 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Binfilter
     Sortkey = "700";
     InstallOrder = "1100";
     ParentID = gid_Module_Optional;
-    Default = YES;
+    Default = NO;
     Files = (gid_File_Share_Registry_Binfilter_Xcd,
     gid_Starregistry_Legacy_Binfilters_Rdb,
     gid_File_Lib_Bf_Go,
@@ -60,6 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template
     ParentID = gid_Module_Optional_Binfilter;
     Name = "gid_Module_Langpack_Binfilter_Template";
     Description = "gid_Module_Langpack_Binfilter_Template";
+    Default = NO;
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Res_Bf_Sch,
              gid_File_Res_Bf_Svx,
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index efc71ac73f63..a4708523640f 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -800,7 +800,7 @@ End
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.Calctemplate.1";
+    Subkey = "opendocument.CalcTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "opendocument.CalcTemplate.1";
     Value = " ";
 End
 
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 0ecb21536613..63dde34437a1 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "opendocument.DrawTemplate.1";
     Value = " ";
 End
 
@@ -881,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "soffice.StarDrawDocument.6";
+    Name = "soffice.StarDrawTemplate.6";
     Value = " ";
 End
 
@@ -891,7 +891,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".otg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "opendocument.DrawTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cce7f1d85ad3..7b270e5aca30 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -892,7 +892,7 @@ RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "opendocument.ImpressTemplate.1";
     Value = " ";
 End
 
@@ -910,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sti\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "soffice.StarImpressDocument.6";
+    Name = "soffice.StarImpressTemplate.6";
     Value = " ";
 End
 
@@ -938,7 +938,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".otp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.ImpressTemplate.1";
     Styles = ();
 End
 
@@ -947,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
-    Value = "soffice.StarImpressDocument.6";
+    Value = "soffice.StarImpressTemplate.6";
     Styles = ();
 End
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f505a886cba8..a7c1f2826381 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -85,7 +85,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
              gid_Brand_File_Share_Registry_Brand_Xcd,
-             gid_Brand_File_Share_Registry_O5oo_Xcd
+             gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
              gid_Brand_File_Share_Xdg_Calc,
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 8ad8526d9ef6..10e2dca219fb 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -142,7 +142,7 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
 File gid_File_FcLocal_Conf
     Dir = gid_Dir_Fonts_Truetype;
     USER_FILE_BODY;
-#   Styles = ();
+//  Styles = ();
     Name = "fc_local.conf";
 End
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3df2dd442e7c..0d50e685d449 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1583,7 +1583,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 // AVMedia
 STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
-#if defined UNX
+#if defined UNX 
+#if defined ENABLE_GSTREAMER
+SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
+#endif
 #ifdef SOLAR_JAVA
 UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 #endif
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index cb14363b14cb..cf5751ba45e6 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
 SCPDEFS+=-DENABLE_SYSTRAY_GTK
 .ENDIF
 
+.IF "$(ENABLE_GSTREAMER)" != ""
+SCPDEFS+=-DENABLE_GSTREAMER
+.ENDIF
+
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 19bdd6cc3c25..e8c20f99ca94 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svx,
 	gid_File_Lib_AVMedia,
 	gid_File_Lib_AVMediaWin,
+	gid_File_Lib_AVMediaGst,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 5b1de3897f77..dcd29c2ed31d 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -51,9 +51,8 @@ Module gid_Module_Optional
 End
 
 Module gid_Module_Dictionaries
-    ParentID = gid_Module_Root;
-    XPDParentID = "root";
-    Sortkey = "300";
+    ParentID = gid_Module_Optional;
+    Sortkey = "215";
     MOD_NAME_DESC ( MODULE_DICTIONARIES );
 End
 
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index 76f389049580..72c209228849 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -28,6 +28,7 @@
 Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "900";
+    Default = NO;
     Language = "<LANGUAGE>";
     Assigns = gid_Module_Langpack_Binfilter_Template;
     Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 8c3f0a5b82ad..903a48af7d44 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1256,7 +1256,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterTemplate.1";
     Value = " ";
 End
 
@@ -1265,7 +1265,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".oth\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterWebTemplate.1";
     Value = " ";
 End
 
@@ -1274,7 +1274,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterGlobalDocument.1";
     Value = " ";
 End
 
@@ -1365,7 +1365,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterTemplate.1";
     Styles = ();
 End
 
@@ -1374,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
-    Value = "soffice.StarWriterDocument.6";
+    Value = "soffice.StarWriterTemplate.6";
     Styles = ();
 End
 
@@ -1446,7 +1446,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterWebTemplate.1";
     Styles = ();
 End
 
@@ -1455,7 +1455,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterGlobalDocument.1";
     Styles = ();
 End
 
diff --git a/set_soenv.in b/set_soenv.in
index d8daf5bf03a4..b39e397c0f7d 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1384,7 +1384,7 @@ if ($platform =~ m/linux|freebsd|netbsd/)
 # This simply adds an include path, so even cases that break the FHS work
 $SOLARINC            .= $STLPORT_inc_stlport;
 }
-if ($platform =~ m/solaris/ && $CC !=~ "gcc")
+if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 {
 $SOLARINC            .= '/SC5 ';
 }
@@ -1619,6 +1619,7 @@ ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
 ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
+ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
@@ -1850,6 +1851,8 @@ ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
 ToFile( "SYSTEM_POPPLER",    "@SYSTEM_POPPLER@",   "e" );
 ToFile( "POPPLER_CFLAGS",    "@POPPLER_CFLAGS@",   "e" );
 ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
+ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
+ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
 ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
 ToFile( "BUILD_PIXMAN",      "@BUILD_PIXMAN@",     "e" );
 ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
@@ -1909,6 +1912,7 @@ ToFile( "ENABLE_AGG",        "@ENABLE_AGG@",       "e" );
 ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
 ToFile( "AGG_VERSION",	     "@AGG_VERSION@",      "e" );
 ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
+ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 127f28cd7631..335ecf961253 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -655,7 +655,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     $installer::globals::globalinfo_copied = 1;
 
     my $logminor = "";
-    my $avoidlanginlog = 0;
     if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; }
     else { $logminor = $installer::globals::minor; }
 
@@ -663,14 +662,15 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     my $loglanguagestring_orig = $loglanguagestring;
     if (length($loglanguagestring) > $installer::globals::max_lang_length)
     {
+        my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring);
         chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`);
-        $loglanguagestring = $shorter;
-        $avoidlanginlog = 1;
+        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+        $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;
     }
 
     $installer::globals::logfilename = "log_" . $installer::globals::build;
     if ( $logminor ne "" ) { $installer::globals::logfilename .= "_" . $logminor; }
-    if ( ! $avoidlanginlog ) { $installer::globals::logfilename .= "_" . $loglanguagestring; }
+    $installer::globals::logfilename .= "_" . $loglanguagestring;
     $installer::globals::logfilename .= ".log";
     $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator;
     installer::systemactions::create_directory($loggingdir);
@@ -732,7 +732,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
     if (!($installer::globals::is_copy_only_project))
     {
-        if ( $installer::globals::iswindowsbuild )
+        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
         {
             installer::windows::msiglobal::set_global_code_variables($languagesarrayref, $languagestringref, $allvariableshashref, $alloldproperties);
         }
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index f4edc8129255..bd700be38758 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -405,6 +405,16 @@ sub determine_ship_directory
     my $shipdrive = $ENV{'SHIPDRIVE'};
 
     my $languagestring = $$languagesref;
+
+    if (length($languagestring) > $installer::globals::max_lang_length )
+    {
+        my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
+        chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
+        # $languagestring = $shorter;
+        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+        $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
+    }
+
     my $productstring = $installer::globals::product;
     my $productsubdir = "";
 
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 136eca913dd9..f8e35f208251 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2308,6 +2308,55 @@ sub determine_rpm_version
     return $rpmversion;
 }
 
+####################################################
+# Writing some info about rpm into the log file
+####################################################
+
+sub log_rpm_info
+{
+    my $systemcall = "";
+    my $infoline = "";
+
+    $infoline = "\nLogging rpmrc content using --showrc\n\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ( $installer::globals::rpm ne "" )
+    {
+        $systemcall = "$installer::globals::rpm --showrc |";
+    }
+    else
+    {
+        $systemcall = "rpm --showrc |";
+    }
+
+    my @fullrpmout = ();
+
+    open (RPM, "$systemcall");
+    while (<RPM>) {push(@fullrpmout, $_); }
+    close (RPM);
+
+    if ( $#fullrpmout > -1 )
+    {
+        for ( my $i = 0; $i <= $#fullrpmout; $i++ )
+        {
+            my $rpmout = $fullrpmout[$i];
+            $rpmout =~ s/\s*$//g;
+
+            $infoline = "$rpmout\n";
+            $infoline =~ s/error/e_r_r_o_r/gi;  # avoiding log problems
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+    }
+    else
+    {
+        $infoline = "Problem in systemcall: $systemcall : No return value\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    $infoline = "End of logging rpmrc\n\n";
+    push( @installer::globals::logfileinfo, $infoline);
+}
+
 #################################################
 # Systemcall to start the packaging process
 #################################################
@@ -2560,6 +2609,12 @@ sub create_packages_without_epm
             mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
         }
 
+        if ( ! $installer::globals::rpminfologged )
+        {
+            log_rpm_info();
+            $installer::globals::rpminfologged = 1;
+        }
+
         my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
 
         installer::logger::print_message( "... $systemcall ...\n" );
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 71429e278f4e..ccef960e0337 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -179,6 +179,7 @@ BEGIN
     $rpm = "";
     $rpmcommand = "";
     $rpmquerycommand = "";
+    $rpminfologged = 0;
     $debian = "";
     $installertypedir = "";
     $controlledmakecabversion = "5";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 0961b598902f..d3ce8a1d3a32 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -530,7 +530,7 @@ sub control_required_parameter
         # and the UpgradeCode for the product are defined.
         # The name "codes.txt" can be overwritten in Product definition with CODEFILENAME (msiglobal.pm)
 
-        if ($installer::globals::iswindowsbuild)
+        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
         {
             $installer::globals::codefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $installer::globals::codefilename;
             installer::files::check_file($installer::globals::codefilename);
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index a073e60a6697..7a2c4cb3f5e3 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1868,7 +1868,7 @@ sub remove_Languagepacklibraries_from_Installset
     }
 
     $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
+    push( @installer::globals::globallogfileinfo, $infoline);
 
     return \@newitemsarray;
 }
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 981dc40f3209..24b070574189 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -292,6 +292,27 @@ sub remove_empty_directory
 }
 
 #######################################################################
+# Calculating the number of languages in the string
+#######################################################################
+
+sub get_number_of_langs
+{
+    my ($languagestring) = @_;
+
+    my $number = 1;
+
+    my $workstring = $languagestring;
+
+    while ( $workstring =~ /^\s*(.*)_(.*?)\s*$/ )
+    {
+        $workstring = $1;
+        $number++;
+    }
+
+    return $number;
+}
+
+#######################################################################
 # Creating the directories, in which files are generated or unzipped
 #######################################################################
 
@@ -380,8 +401,11 @@ sub create_directories
 
             if (length($languagestring) > $installer::globals::max_lang_length )
             {
+                my $number_of_languages = get_number_of_langs($languagestring);
                 chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-                $languagestring = $shorter;
+                # $languagestring = $shorter;
+                my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+                $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
             }
 
             $path = $path . $languagestring  . $installer::globals::separator;
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 0068727d0eb8..67f074f610ce 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,6 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
+			BUILD_STAX YES
 			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
 			common_build TRUE
 			COMMON_OUTDIR common
@@ -600,7 +601,7 @@ unxlngi6
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
 			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
@@ -630,10 +631,12 @@ unxlngi6
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
 		}
 		common2
 		{
 			ENABLE_GRAPHITE TRUE
+			ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
@@ -821,6 +824,7 @@ unxlngi6
 		sysbaseroot
 	}
 }
+
 unxlngx6
 {
 	environment
@@ -837,7 +841,7 @@ unxlngx6
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -849,7 +853,7 @@ unxlngx6
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -872,11 +876,11 @@ unxlngx6
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
             HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
             HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
+			LIBRARY_PATH %SYSBASE%/usr/lib64
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+			SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
@@ -884,13 +888,13 @@ unxlngx6
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
 		}
 		common1
 		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
 			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
+			PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
 			PKGFORMAT rpm
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -905,11 +909,14 @@ unxlngx6
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SYSTEM_STL YES
 			XAU_LIBS -lXau
+            PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
 		}
 		common2
 		{
+            PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
 			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
+			ENABLE_GSTREAMER TRUE
+            BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -918,7 +925,7 @@ unxlngx6
 			CVER C341
 			ENABLE_KAB TRUE
 			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
+			ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
 			GUI UNX
 			GUIBASE unx
 			GUIENV sal
@@ -926,7 +933,7 @@ unxlngx6
 			INPATH unxlngx6%PROEXT%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
-			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+			KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
@@ -1097,6 +1104,7 @@ unxlngx6
 		sysbaseroot
 	}
 }
+
 unxmacxi
 {
 	environment
@@ -2120,242 +2128,6 @@ unxsolu4
 		sysbaseroot
 	}
 }
-unxubti8
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:
-			MKOUT mkout.pl
-			SOLAREXTRAINC -I%SOLAR_STLPATH%
-			SOLAREXTRALIB -L../lib
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-		}
-		common1
-		{
-			AGG_VERSION 2300
-			ANT /usr/share/ant/bin/ant
-			ANT_HOME /usr/share/ant
-			ANT_LIB /usr/share/ant/lib
-			AWTLIB -ljawt
-			CC gcc
-			COMPATH /usr/bin
-			CXX g++
-			DEVROOT %SOLAR_ENV_ROOT%
-			EXCEPTIONS dwarf2
-			EXTERNAL_WARNINGS_NOT_ERRORS 1
-			GNUMAKE make
-			GXX_INCLUDE_PATH /usr/include/c++/4.2
-			HAVE_LD_HASH_STYLE TRUE
-			JAVACOMPILER /usr/bin/javac
-			JAVADOC /usr/bin/javadoc
-			JDK sun
-			LFS_CFLAGS -D_FILE_OFFSET_BITS=64
-			PAM YES
-			PAM_LINK NO
-			PERL /usr/bin/perl
-			PKGFORMAT deb
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-			SOLAR_PLUGIN TRUE
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			VBA_EXTENSION NO
-			WITH_LANG en-US de
-			XAU_LIBS -lXau
-			XCLASSPATH /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar:.
-			XINERAMA_LINK dynamic
-			ZIPDEP zipdep.pl
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SRC_ROOT%/external/common
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C341
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxubti8%PROEXT%
-			NO_BSYMBOLIC TRUE
-			OJDK16PATH /usr/lib/jvm/java-6-openjdk
-			OS LINUX
-			OUTPATH unxubti8
-			RPM /usr/bin/rpmbuild
-			SOLAR_STLPATH %SOLARVERSION%$/unxubti8%PROEXT%$/inc%UPDMINOREXT%$/stl
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH /usr/bin
-		}
-		debug
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk15
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
-			JDKPATH %OJDK16PATH%/bin
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
-			JDKPATH %OJDK16PATH%/bin
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
-	reset
-	{
-		CLASSPATH
-		COPYALL
-		ENABLE_CRASHDUMP
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		debug
-		distroot
-		envroot
-		jdk15
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-	}
-}
 wntgcci1
 {
 	environment
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 937c345e2de8..77b2f592ac67 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -44,6 +44,7 @@ common
 		BUILD_TOOLS
         BUILD_TYPE
 		BUILD_SPECIAL
+		BUILD_STAX
         BUILD_X64
 		CLASSPATH
 		CALL_CDECL
@@ -168,6 +169,7 @@ common
 		PACKMS
 		PCLEAN_PATH
         PKGCONFIG_ROOT
+        PKG_CONFIG_PATH
         PKGFORMAT
 		PRE
 	    PREBUILD_MOZAB
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 42eb91b48474..0c06cef68b75 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m84(Build:9512)
-BUILD=9512
-LAST_MINOR=m84
+RSCREVISION=300m86(Build:9518)
+BUILD=9518
+LAST_MINOR=m86
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c5283fb1b59e..76407f9f0384 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -827,6 +827,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)
 .IF  "$(LOCALIZESDF)"==""
 LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
 LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.IF  "$(LOCALIZESDF)"==""
+LOCALSDFFILE!:=
+.ENDIF			# "$(LOCALIZESDF)"==""
 .ENDIF			# "$(LOCALIZESDF)"==""
 # dummy target to keep the build happy.
 .IF  "$(LOCALIZESDF)"==""
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index a05b4629755e..e558c9955d82 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -199,6 +199,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
 KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
 KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
 SOLARLIB+=-L$(KDE_ROOT)/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+SOLARLIB+=-L$(KDE_ROOT)/lib64
+.ENDIF          # "$(OS)$(CPU)" == "LINUXX"
 .ENDIF          # "$(KDE_ROOT)"!=""
 .ENDIF          # "$(ENABLE_KDE)" != ""
 
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index be8c5d01b714..aff552dde89c 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -198,6 +198,14 @@ STDLIBCUIMT+=-ltcmalloc
 STDSHLGUIMT+=-ltcmalloc
 STDSHLCUIMT+=-ltcmalloc
 .ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 LINKFLAGS += -Wl,--hash-style=both
 .ELSE
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index 1ced6c3912d0..414f15d0dc92 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -29,7 +29,5 @@
 
 .INCLUDE : unxlng.mk
 CDEFS+=-DX86_64
-MODULES_WITH_WARNINGS+=\
-    svx
 DLLPOSTFIX=lx
 BUILD64=1
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index d4c205f942b9..9c2b9be4189a 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -26,14 +26,14 @@
  *************************************************************************/
 
 #define VERSION         3
-#define SUBVERSION      2
+#define SUBVERSION      3
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT       0
+//#define VER_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
new file mode 100644
index 000000000000..ac49f6c6fcf6
--- /dev/null
+++ b/solenv/inc/version.lst
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+OOOBASEVERSIONMAJOR=3
+OOOBASEVERSIONMINOR=3
+OOOBASEVERSIONMICRO=0
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 70ea1c193ee6..9773f10fdddf 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -26,14 +26,14 @@
  *************************************************************************/
 
 #define VERSION         9
-#define SUBVERSION      2
+#define SUBVERSION      3
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT       0
+//#define VER_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
new file mode 100644
index 000000000000..31a255e48be1
--- /dev/null
+++ b/solenv/inc/versionlist.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.INCLUDE: version.lst
+
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index e69de29bb2d1..edbfc190c808 100644
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -0,0 +1,2 @@
+mkdir: %_DEST%\bin%_EXT%

+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst

diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index a573d78eed75..d0517d832f45 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -733,6 +733,7 @@ usage()
             pprogname);
 }
 
+#ifdef WNT
 /* my very simple minded implementation of getopt()
  * it's to sad that getopt() is not available everywhere
  * note: this is not a full POSIX conforming getopt()
@@ -770,6 +771,7 @@ int simple_getopt(char *pargv[], const char *poptstring)
     }
     return -1;
 }
+#endif
 
 int CDECL
 main(int argc, char *argv[])