applied_patches/0616-presenterscreen-no-license.diff

   1 --- sdext/source/presenter/description.xml.old  2009-04-02 10:52:44.000000000 +0000
   2 +++ sdext/source/presenter/description.xml      2009-04-06 16:42:24.000000000 +0000
   3 @@ -11,12 +11,6 @@
   4      <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
   5    </dependencies>
   6
   7 -  <registration>
   8 -    <simple-license accept-by="admin" default-license-id="lic-en-US">
   9 -      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
  10 -    </simple-license>
  11 -  </registration>
  12 -
  13    <version value="1.0.2" />
  14
  15    <platform value="UPDATED_PLATFORM" />
  16 --- sdext/source/presenter/makefile.mk.old      2009-04-02 10:52:44.000000000 +0000
  17 +++ sdext/source/presenter/makefile.mk  2009-04-06 16:42:24.000000000 +0000
  18 @@ -115,12 +115,6 @@ ZIP1LIST=          *
  19
  20  DESCRIPTION:=$(ZIP1DIR)$/description.xml
  21
  22 -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
  23 -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
  24 -.ELSE
  25 -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
  26 -.ENDIF
  27 -
  28  .IF "$(WITH_LANG)"==""
  29  FIND_XCU=registry/data
  30  .ELSE                  # "$(WITH_LANG)"==""
  31 @@ -236,7 +228,6 @@ COMPONENT_HELP=                                                             \
  32         $(ZIP1DIR)$/help/component.txt
  33
  34  ZIP1DEPS=                                      \
  35 -       $(PACKLICS)                     \
  36         $(DESCRIPTION)                  \
  37         $(COMPONENT_MANIFEST)   \
  38         $(COMPONENT_FILES)              \
  39 @@ -318,16 +309,6 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:
  40  .ENDIF
  41
  42
  43 -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
  44 -$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
  45 -       @@-$(MKDIRHIER) $(@:d)
  46 -       $(GNUCOPY) $< $@
  47 -.ELSE
  48 -$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
  49 -       @@-$(MKDIRHIER) $(@:d)
  50 -       $(GNUCOPY) $< $@
  51 -.ENDIF
  52 -
  53
  54  $(ZIP1DIR)/%.xcu : %.xcu
  55         @@-$(MKDIRHIER) $(@:d)