[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-1-105-g540a6fc
The following commit has been merged in the debian-experimental-4.1 branch:
commit af91bd48263895265555427c14eda3bff9cb5ed6
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 7 23:35:58 2013 +0200
update make-package-modules-not-suck.diff...
diff --git a/changelog b/changelog
index 9f34dc7..646e155 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta1~git20130506-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta1~git20130507-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 5835e3e..b8f04ad 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -101,15 +101,15 @@ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidd
index ed7729e..5a03e3d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
-@@ -213,8 +208,6 @@ Module gid_Module_Root_Files_4
+@@ -166,8 +166,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Lib_BaseBmp,
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,
- gid_File_Lib_Guesslang);
+ gid_File_Lib_Vclplug_Svp);
End
+
diff --git a/Repository.mk b/Repository.mk
index 4b2c1f0..9423f87 100644
--- a/Repository.mk
@@ -155,14 +155,14 @@ index 4b2c1f0..9423f87 100644
sfx \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
-@@ -306,7 +299,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+@@ -327,7 +327,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
svt \
svx \
svxcore \
- sw \
- tk \
- tl \
- $(if $(ENABLE_TELEPATHY),tubes) \
+ $(if $(ENABLE_TDEAB),tdeab1) \
+ $(if $(ENABLE_TDEAB),tdeabdrv1) \
+ textconversiondlgs \
@@ -325,10 +317,32 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
xsltfilter \
))
@@ -196,14 +196,14 @@ index 4b2c1f0..9423f87 100644
swd \
swui \
t602filter \
-@@ -634,7 +634,6 @@
+@@ -628,7 +628,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
postgresql-sdbc-impl \
pythonloader \
simplecanvas \
- slideshow \
stringresource \
syssh \
- tdebe1 \
+ ucpcmis1 \
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 225cf94..53ad321 100644
--- a/scp2/InstallModule_base.mk
@@ -266,8 +266,8 @@ index ded46b9..447c331 100644
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 := KDE OOO URE WRITER
-+gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER BASE DRAW IMPRESS
+-gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER
++gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER BASE DRAW IMPRESS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
--
LibreOffice packaging repository
Reply to: