[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - readlicense_oo/odt solenv/gbuild

[Libreoffice Gerrit user]

 readlicense_oo/odt/LICENSE.odt   |binary
 solenv/gbuild/ExtensionTarget.mk |    1 +
 2 files changed, 1 insertion(+)

New commits:
commit 9ecaf9c810b3fc53046273257aee3d140e74b2be
Author: Andras Timar <atimar at suse.com>
Date:   Thu Dec 6 09:53:47 2012 +0100

    rm intermediate files that are input of helpindexer and should not be packaged
    
    Change-Id: I8b3e526fd413bd3ced75bf1cd81f9be2540bf9e8

diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index ff5b790..b3fb4f0 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -428,6 +428,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done : \
             $$(HELPFILES)) && \
         $(gb_ExtensionTarget_HELPINDEXERCOMMAND) -lang $(2) -mod help \
             -dir $$(basename $$@) && \
+            rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \
         touch $$@)
 
 endef
commit f71fc1948db9acb641c396e9516ba28f8b85484c
Author: Andras Timar <atimar at suse.com>
Date:   Wed Dec 5 10:21:56 2012 +0100

    Bye bye ODMA (LICENSE.odt)
    
    Change-Id: I5e83d9fd524e5a414e0bd12879c53f20e0df9fd4

diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index 4f7f027..5e2b4a6 100644
Binary files a/readlicense_oo/odt/LICENSE.odt and b/readlicense_oo/odt/LICENSE.odt differ