[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-107-gc2fb163
The following commit has been merged in the debian-experimental-4.1 branch:
commit c2fb163330d80386eeedb6aaf0d15e88532bce08
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 7 21:03:09 2013 +0200
fix flat, mysql, odbc, odbcbase install into -base
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 0da224e..5835e3e 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -11,21 +11,17 @@ index 57f8b81..7274823 100644
Module gid_Module_Prg_Base
MOD_NAME_DESC(MODULE_PRG_BASE);
ParentID = gid_Module_Prg;
-@@ -51,6 +51,18 @@ Module gid_Module_Prg_Base_Bin
+@@ -51,6 +51,14 @@ Module gid_Module_Prg_Base_Bin
,gid_File_Lib_Abp
,gid_File_Lib_Dbp
,gid_File_Lib_Dbu
+ ,auto_Base_Lib_ALL
-+ gid_File_Lib_Odbcbase
+ ,gid_File_Lib_Dbpool
-+ ,gid_File_Lib_Odbc
+ ,gid_File_Lib_Sdbc_2
-+ ,gid_File_Lib_Mysql
+#ifdef SOLAR_JAVA
+ ,gid_File_Lib_Jdbc
+ ,gid_File_Lib_Hsqldb_2
+#endif
-+ ,gid_File_Lib_Flat
+ ,gid_File_Lib_Calc
);
End
@@ -130,6 +126,24 @@ index 4b2c1f0..9423f87 100644
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
+@@ -260,7 +260,6 @@
+ eti \
+ evtatt \
+ exp \
+- flat \
+ file \
+ filterconfig \
+ for \
+@@ -292,9 +291,6 @@
+ lnth \
+ $(if $(MERGELIBS),merged) \
+ msfilter \
+- mysql \
+- odbc \
+- odbcbase \
+ odfflatxml \
+ offacc \
+ pcr \
@@ -294,10 +291,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
sb \
sdbt \
@@ -149,7 +163,7 @@ index 4b2c1f0..9423f87 100644
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
-@@ -325,10 +317,28 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+@@ -325,10 +317,32 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
xsltfilter \
))
@@ -157,6 +171,10 @@ index 4b2c1f0..9423f87 100644
+ dba \
+ dbase \
+ dbaxml \
++ flat \
++ mysql \
++ odbc \
++ odbcbase \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,DRAW, \
--
LibreOffice packaging repository
Reply to: