applied_patches/0598-wiki-publisher-no-license.diff

   1 --- swext/mediawiki/src/makefile.mk.old 2009-04-02 10:56:45.000000000 +0000
   2 +++ swext/mediawiki/src/makefile.mk     2009-04-06 16:42:24.000000000 +0000
   3 @@ -42,27 +42,11 @@ ENABLE_EXCEPTIONS=TRUE
   4
   5  DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
   6
   7 -# .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
   8 -# PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/license_$i)
   9 -# .ELSE
  10 -PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/LICENSE_$i)
  11 -# .ENDIF
  12 -
  13  common_build_zip=
  14
  15  .INCLUDE : target.mk
  16
  17 -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
  18 -$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
  19 -       @@-$(MKDIRHIER) $(@:d)
  20 -       $(GNUCOPY) $< $@
  21 -.ELSE
  22 -$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
  23 -       @@-$(MKDIRHIER) $(@:d)
  24 -       $(GNUCOPY) $< $@
  25 -.ENDIF
  26 -
  27 -ALLTAR: $(PACKLICS) $(DESCRIPTION)
  28 +ALLTAR: $(DESCRIPTION)
  29
  30  .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
  31  .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
  32 --- swext/mediawiki/src/description.xml.old     2009-04-02 10:56:45.000000000 +0000
  33 +++ swext/mediawiki/src/description.xml 2009-04-06 16:42:24.000000000 +0000
  34 @@ -5,11 +5,6 @@
  35      <display-name>
  36          <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
  37      </display-name>
  38 -    <registration>
  39 -        <simple-license accept-by="admin" default-license-id="lic-en-US">
  40 -            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
  41 -        </simple-license>
  42 -    </registration>
  43      <dependencies>
  44          <OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/>
  45      </dependencies>
  46 --- swext/mediawiki/build.xml.old       2009-04-02 10:56:46.000000000 +0000
  47 +++ swext/mediawiki/build.xml   2009-04-06 16:42:24.000000000 +0000
  48 @@ -146,7 +146,6 @@
  49              <file file="${commons-logging-jar}"/>
  50              <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
  51              <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
  52 -            <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
  53              <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
  54          </zip>
  55      </target>
  56 @@ -164,7 +163,6 @@
  57              <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/>
  58              <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
  59              <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
  60 -            <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
  61              <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
  62          </zip>
  63      </target>