[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/presenterscreen-no-license.diff |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 843f40795506d14f58eefa7879a21fa3386d232f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 14:13:06 2009 +0300

    Adapt presenterscreen-no-license.diff for dev300-m54
    
    * patches/dev300/presenterscreen-no-license.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/presenterscreen-no-license.diff b/patches/dev300/presenterscreen-no-license.diff
index 41bbfda..ee7e889 100644
--- a/patches/dev300/presenterscreen-no-license.diff
+++ b/patches/dev300/presenterscreen-no-license.diff
@@ -15,7 +15,7 @@
    <platform value="UPDATED_PLATFORM" />
 --- sdext/source/presenter/makefile.mk.old	2009-04-02 10:52:44.000000000 +0000
 +++ sdext/source/presenter/makefile.mk	2009-04-06 16:42:24.000000000 +0000
-@@ -115,14 +115,6 @@ ZIP1LIST=		*
+@@ -115,12 +115,6 @@ ZIP1LIST=		*
  
  DESCRIPTION:=$(ZIP1DIR)$/description.xml
  
@@ -25,11 +25,9 @@
 -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
 -.ENDIF
 -
--
--
- COMPONENT_FILES=																			\
-     $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Jobs.xcu							\
-     $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu				\
+ .IF "$(WITH_LANG)"==""
+ FIND_XCU=registry/data
+ .ELSE			# "$(WITH_LANG)"==""
 @@ -236,7 +228,6 @@ COMPONENT_HELP= 								\
  	$(ZIP1DIR)$/help/component.txt
  
@@ -52,6 +50,6 @@
 -	$(GNUCOPY) $< $@
 -.ENDIF
 -
+ 
  $(ZIP1DIR)/%.xcu : %.xcu
  	@@-$(MKDIRHIER) $(@:d)
- 	$(GNUCOPY) $< $@