[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-154-g0ff6f24
The following commit has been merged in the debian-experimental-4.0 branch:
commit 0ff6f24598be5aaa71395e9690bb2601b74cb7c0
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 26 22:25:15 2012 +0100
unfuzzy make-package-modules-not-suck.diff and py2uno-module.diff
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 79d4527..e60c01d 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -108,9 +108,9 @@ index 024ec68..a46e972 100644
gid_File_Bin_Open_Url,
gid_File_Bin_Pagein,
gid_File_Bin_Pluginapp,
-@@ -181,7 +181,6 @@ Module gid_Module_Root_Files_4
- Styles = (HIDDEN_ROOT);
- Files = (gid_File_Dat_Root4,
+@@ -183,7 +182,6 @@ Module gid_Module_Root_Files_4
+ gid_File_Dat_XpdfimportErrPdf,
+ gid_File_Exe_Xpdfimport,
gid_File_Filter_Eme,
- gid_File_Filter_Sdfilt,
gid_File_Filter_Svgio,
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index 00bc18c..e074925 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -9,10 +9,10 @@
readlicense_oo\
registry\
diff --git a/Repository.mk b/Repository.mk
-index 3609d09..c0b11c2 100644
+index 16ef7ba..ea257b1 100755
--- a/Repository.mk
+++ b/Repository.mk
-@@ -463,7 +463,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+@@ -464,7 +464,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
officebean \
package2 \
pyuno \
@@ -22,9 +22,9 @@ index 3609d09..c0b11c2 100644
recentfile \
scriptframe \
sdbc2 \
-@@ -567,6 +569,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
- OGLTrans \
+@@ -571,6 +573,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
passwordcontainer \
+ pdfimport \
pythonloader \
+ python2loader \
postgresql-sdbc \
--
LibreOffice packaging repository
Reply to: