[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.6.1_rc2-1-80-gdbb8495
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 7a336fcd09bc8e0c28a1cc55184eedbd04e3ad03
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Oct 2 22:25:36 2012 +0200
update patches/split-binfilters-and-evo.diff
diff --git a/patches/split-binfilters-and-evo.diff b/patches/split-binfilters-and-evo.diff
index 6a6098b..9074287 100644
--- a/patches/split-binfilters-and-evo.diff
+++ b/patches/split-binfilters-and-evo.diff
@@ -124,14 +124,14 @@
#endif // #ifdef UNX
--- libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp-old 2011-12-20 05:15:16.000000000 +0100
+++ libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp 2011-12-20 05:15:30.000000000 +0100
-@@ -42,6 +42,7 @@
- #endif
+@@ -43,6 +43,7 @@ Module gid_Module_Optional_Gnome
Files = (
+ #ifdef ENABLE_EVOAB2
gid_File_Lib_Evoab,
+ gid_File_Share_Registry_Evoab_Xcd,
+ #endif
+ #ifdef ENABLE_GTK
gid_File_Lib_Fps_Gnome,
- gid_File_Lib_Vclplug_Gtk,
- #ifdef ENABLE_GTK3
diff -u binfilter-old/file_binfilter.scp binfilter/file_binfilter.scp
--- libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-06 14:02:07.000000000 +0000
+++ libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-20 10:16:46.000000000 +0000
--
LibreOffice packaging repository
Reply to: