Sun May 5 07:29:48 PDT 2013

Repository.mk                                    |   10 +++++--
 desktop/Module_desktop.mk                        |    5 ++-
 desktop/Package_scripts.mk                       |    3 --
 desktop/Package_scripts_install.mk               |   32 +++++++++++++++++++++++
 desktop/scripts/mozwrapper.sh                    |   25 -----------------
 desktop/scripts/smaster.sh                       |    4 --
 desktop/scripts/sweb.sh                          |    4 --
 instsetoo_native/CustomTarget_setup.mk           |   12 ++++++++
 instsetoo_native/Package_config.mk               |    2 -
 instsetoo_native/Package_rdb.mk                  |   18 +++++++++++-
 instsetoo_native/Package_setup.mk                |    1 
 instsetoo_native/config/unorc.ure                |   13 ---------
 instsetoo_native/util/openoffice.lst.in          |   12 ++++----
 jvmfwk/Module_jvmfwk.mk                          |    7 +++++
 jvmfwk/Package_jreproperties_install.mk          |   16 +++++++++++
 jvmfwk/Package_rcfiles_install.mk                |   32 +++++++++++++++++++++++
 liblangtag/ExternalPackage_liblangtag_data.mk    |    8 +++++
 nss/ExternalPackage_nss.mk                       |    2 -
 officecfg/registry/data/org/openoffice/Setup.xcu |    2 -
 postprocess/Package_registry_install.mk          |    5 +++
 pyuno/Module_pyuno.mk                            |    6 ++++
 pyuno/Package_python_scripts_install.mk          |   20 ++++++++++++++
 solenv/gbuild/UnoApiTarget.mk                    |    4 +-
 ure/Module_ure.mk                                |    1 
 ure/Package_install.mk                           |   18 ++++++++++++
 25 files changed, 194 insertions(+), 68 deletions(-)

New commits:
commit ed665f24ff62bc00acd41620f91cb9dc458c8a2e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 15:27:49 2013 +0200

    copy pyuno files to instdir
    
    Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 366f1a9..a669fd5 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
 
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 	ooenv \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
 	ure-link \
 	versionrc \
 ))
@@ -31,6 +32,17 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
 		echo 'export OOO_DISABLE_RECOVERY=1' \
 	) > $@
 
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	( \
+		echo '[Bootstrap]' && \
+		$(if $(filter YES,$(SYSTEM_PYTHON)),\
+			echo PYUNO_LOADER_PYTHONPATH='$$ORIGIN',\
+			echo PYUNO_LOADER_PYTHONHOME='$$ORIGIN/python-core-$(PYTHON_VERSION)' && \
+			echo PYUNO_LOADER_PYTHONPATH='$(foreach dir,lib lib/lib-dynload lib/lib-tk lib/site-packages,$$ORIGIN/python-core-$(PYTHON_VERSION)/$(dir)) $$ORIGIN' \
+		) \
+	) > $@
+
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LN ,1)
 	rm -f $@ && \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 9f8ca30..aaba1e5 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,program,\
 	ooenv \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \
 	versionrc \
 ))
 
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 536ba40..05aefa6 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -60,6 +60,12 @@ endif
 
 endif # SYSTEM_PYTHON
 
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(eval $(call gb_Module_add_targets,pyuno,\
+	Package_python_scripts_install \
+))
+endif
+
 endif # DISABLE_PYTHON
 
 # vim:set noet sw=4 ts=4:
diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk
new file mode 100644
index 0000000..dc2f08e
--- /dev/null
+++ b/pyuno/Package_python_scripts_install.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,pyuno_python_scripts_install,$(SRCDIR)/pyuno/source))
+
+$(eval $(call gb_Package_set_outdir,pyuno_python_scripts_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,program,\
+	loader/pythonloader.py \
+	module/uno.py \
+	module/unohelper.py \
+))
+
+# vim: set noet sw=4 ts=4:
commit e64e85b2211a10fc6e1584aec2dc199d49d46d79
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 15:02:50 2013 +0200

    copy more rc files to instdir
    
    Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32

diff --git a/instsetoo_native/Package_config.mk b/instsetoo_native/Package_config.mk
index 6eef87b..01c708b 100644
--- a/instsetoo_native/Package_config.mk
+++ b/instsetoo_native/Package_config.mk
@@ -17,6 +17,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_config,program,\
 	unorc \
 ))
 
-$(eval $(call gb_Package_add_file,instsetoo_native_config,ure/lib/unorc,unorc.ure))
-
 # vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/config/unorc.ure b/instsetoo_native/config/unorc.ure
deleted file mode 100644
index 78d4d6e..0000000
--- a/instsetoo_native/config/unorc.ure
+++ /dev/null
@@ -1,13 +0,0 @@
-= This file is part of the LibreOffice project.
-=
-= This Source Code Form is subject to the terms of the Mozilla Public
-= License, v. 2.0. If a copy of the MPL was not distributed with this
-= file, You can obtain one at http://mozilla.org/MPL/2.0/.
-=
-
-[Bootstrap]
-URE_INTERNAL_LIB_DIR=${ORIGIN}
-URE_INTERNAL_JAVA_DIR=${ORIGIN}../share/java
-URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
-UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}
-UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 51ae323..dbd8d2b 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -30,6 +30,13 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
 endif
 endif
 
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+	Package_jreproperties_install \
+	Package_rcfiles_install \
+))
+endif
+
 endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_jreproperties_install.mk b/jvmfwk/Package_jreproperties_install.mk
new file mode 100644
index 0000000..a27fc3d
--- /dev/null
+++ b/jvmfwk/Package_jreproperties_install.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,jvmfwk_jreproperties_install,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
+
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_install,ure/lib/JREProperties.class,JREProperties.class))
+
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_rcfiles_install.mk b/jvmfwk/Package_rcfiles_install.mk
new file mode 100644
index 0000000..253f7ed
--- /dev/null
+++ b/jvmfwk/Package_rcfiles_install.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,jvmfwk_rcfiles_install,$(SRCDIR)/jvmfwk))
+
+$(eval $(call gb_Package_set_outdir,jvmfwk_rcfiles_install,$(INSTDIR)))
+
+ifneq ($(OS),WNT)
+ifeq ($(OS),FREEBSD)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml))
+else ifeq ($(OS),LINUX)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
+else ifeq ($(OS),AIX)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
+else
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
+endif
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
+else
+$(call gb_Output_error,Unsupported platform)
+endif
+
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 1d9178b..2a48f32 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
     Package_distribution \
+	$(if $(gb_RUNNABLE_INSTDIR),Package_install) \
     Rdb_ure \
 ))
 
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
new file mode 100644
index 0000000..de48dd4
--- /dev/null
+++ b/ure/Package_install.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
+
+$(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh))
+$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,jvmfwk3),jvmfwk3rc))
+$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,uno),unorc))
+
+# vim:set noet sw=4 ts=4:
commit 1ca02a5c2e20f669612005a5b29ef11d510125bd
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 14:43:14 2013 +0200

    drop unused scripts
    
    Change-Id: Icf4526214d9cfaaa9fe41b40b662c1e3bd9e6960

diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index b34e8e9..aa6dc5d 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -16,14 +16,11 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/ure-link,ure-link))
 else
 
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/mozwrapper,mozwrapper.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/scalc,scalc.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/smaster,smaster.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/sweb,sweb.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
diff --git a/desktop/scripts/mozwrapper.sh b/desktop/scripts/mozwrapper.sh
deleted file mode 100755
index d8f880b..0000000
--- a/desktop/scripts/mozwrapper.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# if mozilla is not found, specify full path here
-MOZILLA=mozilla
-
-if ${MOZILLA} -remote "openURL($1,new-window)" 2>&1 | egrep -si "not running on display"; then
-    ${MOZILLA} $1
-fi
diff --git a/desktop/scripts/smaster.sh b/desktop/scripts/smaster.sh
deleted file mode 100755
index ed9b09d..0000000
--- a/desktop/scripts/smaster.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cmd=`dirname "$0"`/soffice
-exec "$cmd" --global "$@"
diff --git a/desktop/scripts/sweb.sh b/desktop/scripts/sweb.sh
deleted file mode 100755
index a365392..0000000
--- a/desktop/scripts/sweb.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cmd=`dirname "$0"`/soffice
-exec "$cmd" --web "$@"
commit e37c63a1d73fadee4fbd2e2b6650f5d1a23d0e50
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 14:28:02 2013 +0200

    copy scripts to instdir
    
    Change-Id: Id7367d8f540f708071df89fd056dba485751df1c

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 40e4f62..2d322aa 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -36,7 +36,10 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_migrationoo2 \
     Library_migrationoo3 \
     Library_unopkgapp \
-    $(if $(gb_RUNNABLE_INSTDIR),Package_pagein_install) \
+    $(if $(gb_RUNNABLE_INSTDIR),\
+        Package_pagein_install \
+        Package_scripts_install \
+    ) \
     Package_scripts \
     Pagein_calc \
     Pagein_common \
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
new file mode 100644
index 0000000..c75f6db
--- /dev/null
+++ b/desktop/Package_scripts_install.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTDIR)))
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Package_add_file,desktop_scripts_install,bin/ure-link,ure-link))
+
+else
+
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/sbase,sbase.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/scalc,scalc.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/sdraw,sdraw.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/simpress,simpress.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/smath,smath.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/swriter,swriter.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,program/unopkg,unopkg.sh))
+
+endif
+
+# vim: set ts=4 sw=4 noet:
commit b08a5ac83be0c5323c064da07dad64c8958c8026
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 14:22:34 2013 +0200

    copy more rdb files into instdir
    
    Change-Id: I92fe5833fb7e4c869d1bf1b14b257394ce1b820b

diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk
index af41c9e..9e28f06 100644
--- a/instsetoo_native/Package_rdb.mk
+++ b/instsetoo_native/Package_rdb.mk
@@ -11,8 +11,22 @@ $(eval $(call gb_Package_Package,instsetoo_native_rdb,$(OUTDIR)))
 
 $(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_file,instsetoo_native_rdb,program/services/services.rdb,xml/services.rdb))
-$(eval $(call gb_Package_add_file,instsetoo_native_rdb,program/types/offapi.rdb,bin/offapi.rdb))
+$(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/services,\
+	xml/services.rdb \
+	$(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
+	$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
+		$(if $(SOLAR_JAVA),\
+			$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),xml/scriptproviderforbeanshell.rdb) \
+			$(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),xml/scriptproviderforjavascript.rdb) \
+		) \
+	) \
+))
+
+$(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/types,\
+	bin/offapi.rdb \
+	bin/oovbaapi.rdb \
+))
+
 $(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/services.rdb,xml/ure/services.rdb))
 $(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/types.rdb,bin/udkapi.rdb))
 
commit eee0b9613cc68384698d701ad4d0d371f14df92d
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 14:09:01 2013 +0200

    fix placement of xcd localizations
    
    Change-Id: Iee058e78c47f5d1084ff408b6997e7cdd98ed2ce

diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk
index ca9f7c2..c79d839 100644
--- a/postprocess/Package_registry_install.mk
+++ b/postprocess/Package_registry_install.mk
@@ -15,6 +15,11 @@ $(eval $(call gb_Package_add_files,postprocess_registry_install,share/registry,\
 	$(postprocess_XCDS) \
 	$(foreach lang,$(gb_Configuration_LANGS), \
 		Langpack-$(lang).xcd \
+	) \
+))
+
+$(eval $(call gb_Package_add_files,postprocess_registry_install,share/registry/res,\
+	$(foreach lang,$(gb_Configuration_LANGS), \
 		fcfg_langpack_$(lang).xcd \
 		registry_$(lang).xcd \
 	) \
commit 553e0c7658e0433d3f93586cd0e7abe05ba502ba
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 13:35:57 2013 +0200

    clean up include paths for installer
    
    Change-Id: I03524cb562560921ea053ff81d6647664c912079

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 52e9c2a..2c8e8fd 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
     }
 }
 
@@ -138,7 +138,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
     }
 }
 
@@ -177,7 +177,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
     }
 }
 
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
     }
 }
 
@@ -262,7 +262,7 @@ LibreOffice_Test
         active 1
         compression 5
         script test
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
+        include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
     }
 }
 
@@ -308,6 +308,6 @@ LibreOffice_Dev_Test
         active 1
         compression 5
         script test
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
+        include {solarpath}/bin.{minor}/cppunit,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor}
     }
 }
commit 3c08872842bb61a600724c2576ed8e929767a8d1
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 13:26:47 2013 +0200

    our product is always opensource, part II
    
    This is a follow-up to commit be8a7eb7c1cfcb9d89898c6cf40f560577a0c0a8,
    which dropped the setting from instsetoo_native/util/openoffice.lst .
    
    Change-Id: I86cf333fae78edf1a4d2167505457ac925d96208

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 0dd2974..1d7961b 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -44,7 +44,7 @@
       <value>${FILEFORMATNAME}</value>
     </prop>
     <prop oor:name="ooOpenSourceContext">
-      <value>${OPENSOURCE}</value>
+      <value>1</value>
     </prop>
   </node>
   <node oor:name="Office">
commit 8a5bdd8a74f3c52351ce9524ce97f8b48675b432
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 10:49:00 2013 +0200

    libnsssysinit.so's presumably not needed in instdir
    
    ... because it's not installed either.
    
    Change-Id: I282090e68ff2455b9593bbaba9ec1e16445f2b9d

diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index 1e2ec6c..f2b3935 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\
 else # OS!=WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
 		mozilla/dist/out/lib/libcrmf.a \
+		mozilla/dist/out/lib/libnsssysinit.so \
 ))
 $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
 		mozilla/dist/out/lib/libfreebl3.so \
@@ -86,7 +87,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
 		mozilla/dist/out/lib/libnss3.so \
 		mozilla/dist/out/lib/libnssckbi.so \
 		mozilla/dist/out/lib/libnssdbm3.so \
-		mozilla/dist/out/lib/libnsssysinit.so \
 		mozilla/dist/out/lib/libnssutil3.so \
 		mozilla/dist/out/lib/libplc4.so \
 		mozilla/dist/out/lib/libplds4.so \
commit 9b75fd77c55c107c808f5403b6281b787f55e73f
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 10:46:25 2013 +0200

    liboapprover does not link with any libreoffice lib
    
    -> it does not need RPATH.
    
    Change-Id: I7595417e338e6498742ddeb5d64166b4b99661ff

diff --git a/Repository.mk b/Repository.mk
index 05a01e0..13d7e70 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -72,6 +72,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     xrmex \
 ))
 
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_executables,NONE,\
+    liboapprover \
+))
+endif
+
 $(eval $(call gb_Helper_register_executables,SDK, \
     idlc \
 ))
@@ -145,7 +151,6 @@ $(eval $(call gb_Helper_register_executables,OOO,\
     soffice.bin \
     unopkg.bin \
     gengal.bin \
-    liboapprover \
 ))
 
 ifeq ($(OS),MACOSX)
commit fbfdfee0d749092b8efbc1a458a02f110d3049e9
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 10:45:07 2013 +0200

    langsupport is a dev tool, not installed
    
    Change-Id: I8a4c29e9e15792d006b5392ae40db64baf771563

diff --git a/Repository.mk b/Repository.mk
index 9b5180b..05a01e0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     gsicheck \
     helpex \
     idxdict \
+	langsupport \
 	libtest \
     lngconvex \
     localize \
@@ -110,7 +111,6 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 	g++-wrapper \
 	guiloader \
 	guistdio \
-	langsupport \
 	odbcconfig \
 	officeloader \
 	pyuno/python \
@@ -142,7 +142,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 else
 
 $(eval $(call gb_Helper_register_executables,OOO,\
-    langsupport \
     soffice.bin \
     unopkg.bin \
     gengal.bin \
commit 2e306da484a2f091ded1aaf58cedb512c1e811e0
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 10:36:55 2013 +0200

    fix install of liblangtag data files
    
    Change-Id: I8f65b1050bc832b2c1c008f46e3331649dbe5ac4

diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk
index af4dac9..605af55 100644
--- a/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/liblangtag/ExternalPackage_liblangtag_data.mk
@@ -11,8 +11,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
 
 $(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,liblangtag_data,share/liblangtag,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag,\
 	data/language-subtag-registry.xml \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag/common/bcp47,\
 	data/common/bcp47/calendar.xml \
 	data/common/bcp47/collation.xml \
 	data/common/bcp47/currency.xml \
@@ -24,6 +27,9 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,liblangtag_data,sha
 	data/common/bcp47/transform_mt.xml \
 	data/common/bcp47/transform_private_use.xml \
 	data/common/bcp47/variant.xml \
+))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag/common/supplemental,\
 	data/common/supplemental/likelySubtags.xml \
 ))
 
commit e0d15e8531ba5c6dc2081a7ab7e05ac3bcf32b93
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 5 10:24:18 2013 +0200

    use single rm call
    
    Change-Id: I21cd42a561b2fdc0fb2dbe977b1892cb8888c412

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index cc2a463..74ab7ab 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -127,9 +127,9 @@ $(call gb_UnoApiTarget_get_target,%) :
 $(call gb_UnoApiTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),UNO,4)
 	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_UnoApiTarget_get_target,$*) \
+		rm -rf $(call gb_UnoApiTarget_get_target,$*) \
 			$(call gb_UnoApiTarget_get_target,$*).oldformat \
-		-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
+			$(call gb_UnoApiTarget_get_dep_target,$*) \
 			$(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
 			$(call gb_UnoApiPartTarget_get_target,$*))
 
