[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-8-g8213fcb
The following commit has been merged in the debian-experimental-4.1 branch:
commit 8213fcb21279980810c0014e32c1cb4931feb72e
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 4 23:11:06 2013 +0100
make split-evoab.diff apply again (and simplify for gbuild)
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 1249f80..5257758 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -1,66 +1,3 @@
---- libreoffice-3.5.0/postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
-+++ libreoffice-3.5.0/postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
-@@ -388,10 +382,6 @@ my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootst
- my_components += component/shell/source/cmdmail/cmdmail
- .END
-
--.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
--my_components += component/connectivity/source/drivers/evoab2/evoab
--.END
--
- .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
- my_components += component/avmedia/source/gstreamer/avmediagstreamer
- .END
-@@ -414,3 +414,20 @@ $(MISC)/services.input : makefile.mk
- '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
- > $@
-
-+.IF "$(ENABLE_EVOAB2)" == "YES"
-+ALLTAR : $(MISC)/evoab.rdb
-+
-+$(MISC)/evoab.rdb .ERRREMOVE : \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/evoab.input \
-+ $(SOLARXMLDIR)/connectivity/source/drivers/evoab2/evoab.component
-+ $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-+ $(SOLARENV)/bin/packcomponents.xslt \
-+ $(MISC)/evoab.input
-+
-+$(MISC)/evoab.input : makefile.mk
-+ echo \
-+ '<list><filename>component/connectivity/source/drivers/evoab2/evoab/evoab.component</filename></list>' \
-+ > $@
-+.END
-+
---- libreoffice-3.5.0/postprocess/packregistry/makefile.mk-old 2011-12-20 04:49:53.000000000 +0100
-+++ libreoffice-3.5.0/postprocess/packregistry/makefile.mk 2011-12-20 04:52:13.000000000 +0100
-@@ -32,6 +32,7 @@ MY_XCDS = \
- $(MISC)/ctl.xcd \
- $(MISC)/ctlseqcheck.xcd \
- $(MISC)/draw.xcd \
-+ $(MISC)/evoab.xcd \
- $(MISC)/graphicfilter.xcd \
- $(MISC)/impress.xcd \
- $(MISC)/librelogo.xcd \
-@@ -337,8 +338,8 @@ ERROR : unknown-GUIBASE
- MY_FILES_main += $(MY_MOD)/org/openoffice/ucb/Configuration-neon.xcu
- .END
- .IF "$(ENABLE_EVOAB2)" == "TRUE"
--MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
--MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
-+MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-+MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
- MY_DRIVERS += evoab
- .END
- .IF "$(SOLAR_JAVA)" == "TRUE"
---- libreoffice-3.5.0/postprocess/prj/d.lst-old 2011-12-20 11:39:36.000000000 +0000
-+++ libreoffice-3.5.0/postprocess/prj/d.lst 2011-12-20 11:40:07.000000000 +0000
-@@ -4,4 +4,5 @@
- ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\
- ..\%__SRC%\misc\scriptproviderforbeanshell.rdb %_DEST%\xml\scriptproviderforbeanshell.rdb
- ..\%__SRC%\misc\scriptproviderforjavascript.rdb %_DEST%\xml\scriptproviderforjavascript.rdb
-+..\%__SRC%\misc\evoab.rdb %_DEST%\xml\evoab.rdb
- ..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb
--- libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp-old 2011-12-20 05:11:44.000000000 +0100
+++ libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp 2011-12-20 05:12:07.000000000 +0100
@@ -446,6 +446,13 @@
@@ -87,3 +24,26 @@
#endif
#ifdef ENABLE_GTK
gid_File_Lib_Fps_Gnome,
+diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
+index 181c782..33f4640 100644
+--- a/postprocess/CustomTarget_registry.mk
++++ b/postprocess/CustomTarget_registry.mk
+@@ -25,6 +25,7 @@ postprocess_XCDS := \
+ ctl.xcd \
+ ctlseqcheck.xcd \
+ draw.xcd \
++ evoab.xcd \
+ graphicfilter.xcd \
+ impress.xcd \
+ korea.xcd \
+@@ -327,8 +328,8 @@ ifeq ($(DISABLE_NEON),$(false))
+ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+ endif
+ ifeq ($(ENABLE_EVOAB2),TRUE)
+-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
++postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
++postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+ postprocess_DRIVERS += evoab
+ endif
+ ifeq ($(SOLAR_JAVA),TRUE)
--
LibreOffice packaging repository
Reply to: