The following commit has been merged in the debian-experimental-4.2 branch:
commit f3ee0d24c22d26e7329094aac1ca2b7c0723e372
Author: Rene Engelhard <r...@debian.org>
Date: Tue Jul 16 23:23:31 2013 +0200
*really* merge gid_File_Lib_Vclplug_Kde4 fix...
diff --git a/patches/make-package-modules-not-suck.diff
b/patches/make-package-modules-not-suck.diff
index 167dbbe..26a7e06 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -34,6 +34,24 @@ index f7d92c1..a102275 100644
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
+diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
+index 6fa6155..bd804f1 100644
+--- a/scp2/source/kde/module_kde.scp
++++ b/scp2/source/kde/module_kde.scp
+@@ -26,5 +26,12 @@ Module gid_Module_Optional_Kde
+ PackageInfo = "packinfo_office.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
+ Styles = ();
+- Files = (auto_kde_ALL);
++ Files = (auto_kde_ALL,
++#ifdef ENABLE_KDE
++ gid_File_Lib_Vclplug_Kde
++#endif
++#ifdef ENABLE_KDE4
++ gid_File_Lib_Vclplug_Kde4
++#endif
++);
+ End
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 66edd78..47f17b6 100644
--- a/scp2/AutoInstall.mk
@@ -98,15 +116,6 @@ index 51089bb..3cffd92 100644
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
-@@ -199,6 +219,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
- $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
- $(if $(ENABLE_KDE),kdebe1) \
- $(if $(ENABLE_KDE4),kde4be1) \
-+ $(if $(ENABLE_KDE),vclplug_kde) \
-+ $(if $(ENABLE_KDE4),vclplug_kde4) \
- ))
-
- $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
@@ -222,11 +244,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
configmgr \
ctl \
@@ -175,15 +184,6 @@ index 51089bb..3cffd92 100644
swd \
swui \
t602filter \
-@@ -404,8 +412,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- spell \
- sts \
- vclplug_tde \
-- vclplug_kde \
-- vclplug_kde4 \
- vclplug_svp \
- ))
-
@@ -488,14 +494,12 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
@@ -207,3 +207,18 @@ index 51089bb..3cffd92 100644
sofficeapp \
srtrs1 \
textconv_dict \
+diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk
+index 9130b62..6ccb07f 100644
+--- a/scp2/InstallModule_kde.mk
++++ b/scp2/InstallModule_kde.mk
+@@ -15,4 +15,10 @@ $(eval $(call
gb_InstallModule_add_localized_scpfiles,scp2/kde,\
+ scp2/source/kde/module_kde \
+ ))
+
++$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
++ ENABLE_KAB \
++ ENABLE_KDE \
++ ENABLE_KDE4 \
++))
++
+ # vim: set shiftwidth=4 tabstop=4 noexpandtab:
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uzcjb-0002jb...@vasks.debian.org
