[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-106-g088aa02
The following commit has been merged in the debian-experimental-4.1 branch:
commit 088aa029de35194b611ed882d47f7197a06752f2
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 7 18:30:04 2013 +0200
fix slideshow install into -impress...
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index b790edf..0da224e 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -149,7 +149,7 @@ index 4b2c1f0..9423f87 100644
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
-@@ -325,10 +317,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+@@ -325,10 +317,28 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
xsltfilter \
))
@@ -166,6 +166,10 @@ index 4b2c1f0..9423f87 100644
+ sdui \
+))
+
++$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,IMPRESS, \
++ slideshow \
++))
++
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
@@ -174,6 +178,14 @@ index 4b2c1f0..9423f87 100644
swd \
swui \
t602filter \
+@@ -634,7 +634,6 @@
+ postgresql-sdbc-impl \
+ pythonloader \
+ simplecanvas \
+- slideshow \
+ stringresource \
+ syssh \
+ tdebe1 \
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 225cf94..53ad321 100644
--- a/scp2/InstallModule_base.mk
@@ -200,6 +212,19 @@ index 63a29f8..d5bbf6c 100644
$(eval $(call gb_InstallModule_add_templates,scp2/draw,\
scp2/source/templates/module_langpack_draw \
))
+diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
+index 0deac66..48b786d 100644
+--- a/scp2/InstallModule_impress.mk
++++ b/scp2/InstallModule_impress.mk
+@@ -9,6 +9,8 @@
+
+ $(eval $(call gb_InstallModule_InstallModule,scp2/impress))
+
++$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress))
++
+ $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
+ ENABLE_OPENGL \
+ ))
--- a/scp2/InstallModule_kde.mk 2013-05-04 18:30:06.777713287 +0200
+++ b/scp2/InstallModule_kde.mk 2013-05-07 01:20:44.616196512 +0200
@@ -11,6 +11,12 @@
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index e96933e..248bc25 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -18,8 +18,8 @@ index 16ef7ba..ea257b1 100755
pythonloader \
+ python2loader \
simplecanvas \
- slideshow \
stringresource \
+ syssh \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6beb818..1a570e4 100644
--- a/RepositoryFixes.mk
--
LibreOffice packaging repository
Reply to: