[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.2_rc2-2-80-g3ad363a
The following commit has been merged in the debian-experimental-4.1 branch:
commit 3ad363a840a0859b4887428615e145c806f864e5
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 15 22:16:22 2013 +0200
git update; port patches and fix base install...
diff --git a/changelog b/changelog
index 1d2b842..832f408 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130413-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130415-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index be56536..d347afa 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -2,15 +2,15 @@ diff --git a/configure.ac b/configure.in
index c0b76f8..d10222f 100644
--- libreoffice-3.5.0/configure.ac
+++ libreoffice-3.5.0/configure.ac
-@@ -12091,6 +12108,9 @@ PRODUCTVERSION=AC_PACKAGE_VERSION
- AC_MSG_RESULT([$PRODUCTVERSION])
- AC_SUBST(PRODUCTVERSION)
+@@ -11762,6 +11779,9 @@ else
+ fi
+ AC_SUBST(ICECREAM_RUN)
+CDEFAULTOPT=`echo $CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
+AC_SUBST(CDEFAULTOPT)
+
dnl ===================================================================
- dnl Dealing with l10n options
+ dnl Setting up the environment.
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:08:12.755739649 +0200
+++ b/config_host.mk.in 2012-04-06 14:08:35.351739800 +0200
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 794e541..e48bd5b 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -1,14 +1,21 @@
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
-index 1a245a6..dc9dbf0 100644
+index 57f8b81..7274823 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
-@@ -51,6 +51,20 @@ Module gid_Module_Prg_Base_Bin
+@@ -27,6 +27,8 @@
+
+ #include "macros.inc"
+
++#include "AutoInstallLibs/base"
++
+ Module gid_Module_Prg_Base
+ MOD_NAME_DESC(MODULE_PRG_BASE);
+ ParentID = gid_Module_Prg;
+@@ -51,6 +51,18 @@ Module gid_Module_Prg_Base_Bin
,gid_File_Lib_Abp
,gid_File_Lib_Dbp
,gid_File_Lib_Dbu
-+ ,auto_File_Lib_dba
-+ ,auto_File_Lib_dbase
-+ ,auto_File_Lib_dbaxml
++ ,auto_Base_Lib_ALL
+ ,gid_File_Lib_Odbcbase
+ ,gid_File_Lib_Dbpool
+ ,gid_File_Lib_Odbc
@@ -97,7 +104,7 @@ index 55180c5..742cb6e 100644
End
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
-index 14b0766..82e904e 100644
+index ed7729e..5a03e3d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_2
@@ -109,43 +116,33 @@ index 14b0766..82e904e 100644
gid_File_Bin_Pluginapp,
gid_File_Bin_Senddoc,
@@ -158,7 +157,6 @@ Module gid_Module_Root_Files_4
- Styles = (HIDDEN_ROOT);
Files = (gid_File_Dat_Root4,
+ auto_File_Lib_ALL,
gid_File_Filter_Eme,
- gid_File_Filter_Sdfilt,
gid_File_Filter_Icg,
gid_File_Filter_Egi,
gid_File_Filter_Epb,
-@@ -188,9 +188,6 @@ Module gid_Module_Root_Files_4
- auto_File_Lib_cui,
- auto_File_Lib_sdbt,
- auto_File_Lib_dbmm,
-- auto_File_Lib_dba,
-- auto_File_Lib_dbase,
-- auto_File_Lib_dbaxml,
- auto_File_Lib_dbt,
- auto_File_Lib_file,
- auto_File_Lib_drawinglayer,
-@@ -216,9 +211,6 @@ Module gid_Module_Root_Files_4
- gid_File_Lib_Sax,
- gid_File_Lib_Sb,
+@@ -191,9 +189,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Lib_Sf_Prothdlr,
+ gid_File_Lib_Res,
gid_File_Lib_Scn,
- gid_File_Lib_Sd,
- gid_File_Lib_Sdd,
- gid_File_Lib_Sdui,
- gid_File_Lib_Sfx,
- gid_File_Lib_Sot,
gid_File_Lib_Spa,
-@@ -253,8 +245,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Lib_AVMediaWin,
+ gid_File_Lib_AVMediaGStreamer,
+@@ -213,8 +208,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Zip,
gid_File_Lib_Vclplug_Gen,
gid_File_Lib_Vclplug_Tde,
- gid_File_Lib_Vclplug_Kde,
- gid_File_Lib_Vclplug_Kde4,
gid_File_Lib_Vclplug_Svp,
- auto_File_Lib_canvastools,
- auto_File_Lib_cppcanvas,
-@@ -329,7 +319,6 @@ Module gid_Module_Root_Files_5
+ gid_File_Lib_Guesslang);
+ End
+@@ -278,7 +271,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_DeploymentGui,
gid_File_Lib_Expwrap_Uno,
gid_File_Lib_Fastsax_Uno,
@@ -154,14 +151,96 @@ index 14b0766..82e904e 100644
gid_File_Lib_Scriptframe,
gid_File_Lib_Sdbc_2,
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
-index e66214b..44107d8 100644
+index 1efaec2..b367a9c 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
-@@ -45,6 +45,7 @@
+@@ -46,6 +46,7 @@ Module gid_Module_Prg_Wrt_Bin
+ Styles = (HIDDEN_ROOT);
Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
- gid_File_Lib_Hwpreader,
+ gid_File_Lib_Sw,
- gid_File_Lib_Swd,
- gid_File_Lib_Swui,
- gid_File_Lib_Msword,
+ auto_Writer_Lib_ALL,
+ gid_File_Lib_Vbaswobj,
+ gid_File_Jar_Email,
+diff --git a/Repository.mk b/Repository.mk
+index 4b2c1f0..9423f87 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -227,11 +227,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ cppcanvas \
+ ctl \
+ cui \
+- dba \
+- dbase \
+ dbmm \
+ dbtools \
+- dbaxml \
+ deploymentmisc \
+ $(if $(filter unx,$(GUIBASE)),desktop_detector) \
+ drawinglayer \
+@@ -274,6 +271,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ xo \
+ ))
+
++$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \
++ dba \
++ dbase \
++ dbaxml \
++))
++
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
+ hwp \
+ lwpft \
+diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
+index 225cf94..53ad321 100644
+--- a/scp2/InstallModule_base.mk
++++ b/scp2/InstallModule_base.mk
+@@ -27,6 +27,8 @@
+
+ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
+
++$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
++
+ # Not sure about that?
+ #$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
+ # ENABLE_REPORTBUILDER \
+diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
+index 520a4d9..c826ee7 100644
+--- a/solenv/gbuild/Helper.mk
++++ b/solenv/gbuild/Helper.mk
+@@ -118,7 +118,7 @@ endef
+ define gb_Helper_init_registries
+ gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
+ gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
+-gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
++gb_Library_VALIDINSTALLMODULES := OOO URE WRITER BASE
+ gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
+ gb_Jar_VALIDGROUPS := URE OOO OXT
+
+--- /dev/null 2012-07-03 16:36:49.000000000 +0200
++++ b/scp2/AutoInstallLibs_base.mk 2013-04-15 18:21:21.695428073 +0200
+@@ -0,0 +1,12 @@
++# -*- 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_AutoInstallLibs_AutoInstallLibs,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
++
++# vim: set noet sw=4 ts=4:
+diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
+index 9d856d7..dad7605 100644
+--- a/scp2/Module_scp2.mk
++++ b/scp2/Module_scp2.mk
+@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,scp2))
+ $(eval $(call gb_Module_add_targets,scp2,\
+ AutoInstallLibs_ooo \
+ AutoInstallLibs_ure \
++ AutoInstallLibs_base \
+ AutoInstallLibs_writer \
+ CustomTarget_langmacros \
+ InstallModule_accessories \
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index 4fedf7e..84c7c22 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -2,9 +2,9 @@ diff --git a/Repository.mk b/Repository.mk
index 16ef7ba..ea257b1 100755
--- a/Repository.mk
+++ b/Repository.mk
-@@ -464,7 +464,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+@@ -481,7 +481,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ mozbootstrap \
officebean \
- package2 \
pyuno \
+ py2uno \
pyuno_wrapper \
@@ -12,7 +12,7 @@ index 16ef7ba..ea257b1 100755
recentfile \
scriptframe \
sdbc2 \
-@@ -571,6 +573,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+@@ -600,6 +602,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
passwordcontainer \
pdfimport \
pythonloader \
--
LibreOffice packaging repository
Reply to: