[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-105-g6f917e2
The following commit has been merged in the debian-experimental-4.1 branch:
commit ef8e0c4c488b8b4625db7233b5b5018380371237
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 6 20:10:29 2013 +0200
update to alpha1
diff --git a/changelog b/changelog
index c0b9f6f..1237095 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130503-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 6ed1c72..4a4a203 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -65,61 +65,46 @@ index b5bec12..920fc4e 100644
gid_File_Tmp_Userinstall_Draw_Inf);
End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
-index e3313c8..52d5ea0 100644
+index 29164ac..030d004 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
-@@ -44,6 +44,7 @@ Module gid_Module_Prg_Impress_Bin
+@@ -27,6 +27,8 @@
+
+ #include "macros.inc"
+
++#include "AutoInstallLibs/impress"
++
+ Module gid_Module_Prg_Impress
+ MOD_NAME_DESC ( MODULE_PRG_IMPRESS );
+ ParentID = gid_Module_Prg;
+@@ -43,6 +46,7 @@ Module gid_Module_Prg_Impress_Bin
+ Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
++ auto_Impress_Lib_ALL
gid_File_Lib_PresenterScreen,
-+ gid_File_Lib_Slideshow,
gid_File_Share_Registry_Impress_Xcd,
- gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
- gid_File_Tmp_Userinstall_Impress_Inf);
+ gid_File_Lib_Animcore,
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
-index 55180c5..742cb6e 100644
+index f066710..08a1c1c 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
-@@ -35,15 +35,25 @@ Module gid_Module_Optional_Kde
+@@ -36,5 +36,11 @@ Module gid_Module_Optional_Kde
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = ();
- Files = (
-+ gid_File_Bin_Kde_Open_Url,
- #ifdef ENABLE_KDE
-- gid_File_Lib_Kdebe
-+ gid_File_Lib_Kdebe,
+ Files = (auto_Kde_Lib_ALL
++#ifdef ENABLE_KDE
+ gid_File_Lib_Vclplug_Kde,
-+ gid_File_Lib_Fps_Kde
- #ifdef ENABLE_KDE4
- ,
- #endif // ENABLE_KDE4
- #endif // ENABLE_KDE
- #ifdef ENABLE_KDE4
-- gid_File_Lib_Kde4be
-+ gid_File_Lib_Kde4be,
++#endif
++#ifdef ENABLE_KDE4
+ gid_File_Lib_Vclplug_Kde4,
-+ gid_File_Lib_Fps_Kde4
- #endif // ENABLE_KDE4
-+#ifdef ENABLE_KAB
-+ ,
-+ gid_File_Lib_Kab_1,
-+ gid_File_Lib_Kab_Drv_1
+#endif
);
End
- #endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
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
- Styles = (HIDDEN_ROOT);
- Files = (gid_File_Bin_Cde_Open_Url,
- gid_File_Bin_Tde_Open_Url,
-- gid_File_Bin_Kde_Open_Url,
- gid_File_Bin_Open_Url,
- gid_File_Bin_Pluginapp,
- gid_File_Bin_Senddoc,
@@ -213,8 +208,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Zip,
gid_File_Lib_Vclplug_Gen,
@@ -129,14 +114,6 @@ index ed7729e..5a03e3d 100644
gid_File_Lib_Vclplug_Svp,
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,
-- gid_File_Lib_Slideshow,
- gid_File_Lib_Recentfile,
- gid_File_Lib_Scriptframe,
- gid_File_Lib_Sdbc_2,
diff --git a/Repository.mk b/Repository.mk
index 4b2c1f0..9423f87 100644
--- a/Repository.mk
@@ -224,15 +201,15 @@ index 63a29f8..d5bbf6c 100644
scp2/source/templates/module_langpack_draw \
))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
-index 3130bf7..08c2814 100644
+index ded46b9..447c331 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 RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
--gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
-+gb_Library_VALIDINSTALLMODULES := OOO URE WRITER BASE DRAW
+-gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER
++gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER BASE DRAW IMPRESS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
@@ -266,16 +243,32 @@ index 3130bf7..08c2814 100644
+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,draw,DRAW,LIBO_LIB_FILE,auto_Draw_Lib))
+
+# vim: set noet sw=4 ts=4:
+--- /dev/null 2012-07-03 16:36:49.000000000 +0200
++++ b/scp2/AutoInstallLibs_impress.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,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_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,8 @@ $(eval $(call gb_Module_Module,scp2))
- $(eval $(call gb_Module_add_targets,scp2,\
+@@ -13,6 +13,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
+ AutoInstallLibs_kde \
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
-+ AutoInstallLibs_base \
-+ AutoInstallLibs_draw \
++ AutoInstallLibs_base \
++ AutoInstallLibs_draw \
++ AutoInstallLibs_impress \
AutoInstallLibs_writer \
CustomTarget_langmacros \
InstallModule_accessories \
--
LibreOffice packaging repository
Reply to: