This is an automated email from the git hooks/post-receive script. sweetshark-guest pushed a commit to branch ubuntu-wily-5.0 in repository libreoffice.
commit fc4985d15c97caa294760adc308e958a0d47d253 Author: Rene Engelhard <[email protected]> Date: Fri Apr 17 19:15:22 2015 +0200 update; port split-evoab.diff Conflicts: changelog Conflicts: changelog --- patches/split-evoab.diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff index a929f76..8d4edec 100644 --- a/patches/split-evoab.diff +++ b/patches/split-evoab.diff @@ -31,16 +31,16 @@ index 9f4d0b8..da58fe2 100644 ); End diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk -index 181c782..33f4640 100644 +index e12640f..ec17244 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk -@@ -333,8 +333,9 @@ ifeq ($(DISABLE_NEON),$(false)) - postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu +@@ -333,8 +333,9 @@ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-ne + endif endif ifeq ($(ENABLE_EVOAB2),TRUE) -+postprocess_XCDS += evoab.xcd -postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu -postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu ++postprocess_XCDS += evoab.xcd +postprocess_FILES_evoab += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu +postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu postprocess_DRIVERS += evoab -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
