[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-99-g876e957
The following commit has been merged in the debian-experimental-4.1 branch:
commit 876e9571b7d0a9ac5513fff3b51cfc6fefb6cd9e
Author: Rene Engelhard <rene@debian.org>
Date: Sat May 4 00:32:00 2013 +0200
git update; fix make-package-modules-not-suck.diff
diff --git a/changelog b/changelog
index 2ae4a75..8186761 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130502-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130503-1) UNRELEASED; urgency=low
* new upstream snapshot
* debian/uno-libs3.symbols: update and cleanup - use (symver) instead
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 550c7c4..6ed1c72 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -47,15 +47,20 @@ diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index b5bec12..920fc4e 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
-@@ -43,6 +43,11 @@ Module gid_Module_Prg_Draw_Bin
+@@ -27,6 +27,8 @@
+
+ #include "macros.inc"
+
++#include "AutoInstallLibs/draw"
++
+ Module gid_Module_Prg_Draw
+ MOD_NAME_DESC ( MODULE_PRG_DRAW );
+ ParentID = gid_Module_Prg;
+@@ -43,6 +43,7 @@ Module gid_Module_Prg_Draw_Bin
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
+ auto_Draw_Lib_ALL
-+ gid_File_Lib_Sd,
-+ gid_File_Lib_Sdd,
-+ gid_File_Lib_Sdui,
-+ gid_File_Filter_Sdfilt,
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
@@ -115,16 +120,6 @@ index ed7729e..5a03e3d 100644
gid_File_Bin_Open_Url,
gid_File_Bin_Pluginapp,
gid_File_Bin_Senddoc,
-@@ -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_Spa,
- 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,
@@ -142,23 +137,11 @@ index ed7729e..5a03e3d 100644
gid_File_Lib_Recentfile,
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 1efaec2..b367a9c 100644
---- a/scp2/source/writer/module_writer.scp
-+++ b/scp2/source/writer/module_writer.scp
-@@ -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_Sw,
- 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
-@@ -228,11 +228,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+@@ -229,11 +229,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
configmgr \
ctl \
cui \
@@ -170,16 +153,27 @@ index 4b2c1f0..9423f87 100644
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
-@@ -277,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- sax \
+@@ -294,10 +291,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
sb \
sdbt \
+ scn \
+- sd \
+- sdd \
- sdfilt \
+- sdui \
sfx \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
-@@ -274,6 +271,16 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- xo \
+@@ -306,7 +299,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ svt \
+ svx \
+ svxcore \
+- sw \
+ tk \
+ tl \
+ $(if $(ENABLE_TELEPATHY),tubes) \
+@@ -325,10 +317,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ xsltfilter \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \
@@ -189,12 +183,20 @@ index 4b2c1f0..9423f87 100644
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,DRAW, \
++ sd \
++ sdd \
+ sdfilt \
++ sdui \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
+ msword \
++ sw \
+ swd \
+ swui \
+ t602filter \
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 225cf94..53ad321 100644
--- a/scp2/InstallModule_base.mk
--
LibreOffice packaging repository
Reply to: