[ooo-build-commit] .: patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Wed Sep 15 05:18:20 PDT 2010
patches/dev300/mysqlc-no-license.diff | 23 -----
patches/dev300/pdfimport-no-license.diff | 24 -----
patches/dev300/presentation-minimizer-no-license.diff | 24 -----
patches/dev300/presenterscreen-no-license.diff | 67 ---------------
patches/dev300/reportdesigner-no-license.diff | 14 ---
patches/dev300/wiki-publisher-no-license.diff | 78 ------------------
6 files changed, 230 deletions(-)
New commits:
commit f00bce643589cb6de8a9011f2c24779eb93e5323
Author: Rene Engelhard <rene at debian.org>
Date: Wed Sep 15 14:18:02 2010 +0200
actually rm *-no-license.diff
diff --git a/patches/dev300/mysqlc-no-license.diff b/patches/dev300/mysqlc-no-license.diff
deleted file mode 100644
index 48ebd4f..0000000
--- a/patches/dev300/mysqlc-no-license.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- mysqlc/source/description.xml | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git mysqlc/source/description.xml mysqlc/source/description.xml
-index 727fc6b..cc32c25 100755
---- mysqlc/source/description.xml
-+++ mysqlc/source/description.xml
-@@ -5,11 +5,6 @@
- <identifier value="UPDATED_IDENTIFIER"/>
- <version value="#VERSION#" />
- <platform value="UPDATED_SUPPORTED_PLATFORM" />
-- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-- </simple-license>
-- </registration>
- <display-name>
- <name lang="en-US">#TITLE#</name>
- </display-name>
---
-1.7.0.1
-
diff --git a/patches/dev300/pdfimport-no-license.diff b/patches/dev300/pdfimport-no-license.diff
deleted file mode 100644
index a53b761..0000000
--- a/patches/dev300/pdfimport-no-license.diff
+++ /dev/null
@@ -1,24 +0,0 @@
----
- sdext/source/pdfimport/config/description.xml | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git sdext/source/pdfimport/config/description.xml sdext/source/pdfimport/config/description.xml
-index 726b104..b7340a1 100755
---- sdext/source/pdfimport/config/description.xml
-+++ sdext/source/pdfimport/config/description.xml
-@@ -10,12 +10,6 @@
- <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
- </dependencies>
-
-- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-- </simple-license>
-- </registration>
--
- <version value="1.0.3" />
-
- <platform value="UPDATED_SUPPORTED_PLATFORM" />
---
-1.7.0.1
-
diff --git a/patches/dev300/presentation-minimizer-no-license.diff b/patches/dev300/presentation-minimizer-no-license.diff
deleted file mode 100644
index 93aa68e..0000000
--- a/patches/dev300/presentation-minimizer-no-license.diff
+++ /dev/null
@@ -1,24 +0,0 @@
----
- sdext/source/minimizer/description.xml | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git sdext/source/minimizer/description.xml sdext/source/minimizer/description.xml
-index 64a67a0..455c92a 100755
---- sdext/source/minimizer/description.xml
-+++ sdext/source/minimizer/description.xml
-@@ -11,12 +11,6 @@
- <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
- </dependencies>
-
-- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-- </simple-license>
-- </registration>
--
- <version value="1.0.2"/>
-
- <platform value="UPDATED_SUPPORTED_PLATFORM"/>
---
-1.7.0.1
-
diff --git a/patches/dev300/presenterscreen-no-license.diff b/patches/dev300/presenterscreen-no-license.diff
deleted file mode 100644
index 59f70a6..0000000
--- a/patches/dev300/presenterscreen-no-license.diff
+++ /dev/null
@@ -1,67 +0,0 @@
----
- sdext/source/presenter/description.xml | 6 ------
- sdext/source/presenter/makefile.mk | 17 -----------------
- 2 files changed, 0 insertions(+), 23 deletions(-)
-
-diff --git sdext/source/presenter/description.xml sdext/source/presenter/description.xml
-index ede52f0..cbe292c 100755
---- sdext/source/presenter/description.xml
-+++ sdext/source/presenter/description.xml
-@@ -11,12 +11,6 @@
- <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/>
- </dependencies>
-
-- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-- </simple-license>
-- </registration>
--
- <version value="1.1.0" />
-
- <platform value="UPDATED_PLATFORM" />
-diff --git sdext/source/presenter/makefile.mk sdext/source/presenter/makefile.mk
-index 08a3470..17bc1ed 100755
---- sdext/source/presenter/makefile.mk
-+++ sdext/source/presenter/makefile.mk
-@@ -115,12 +115,6 @@ ZIP1LIST= *
-
- DESCRIPTION:=$(ZIP1DIR)$/description.xml
-
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
--.ELSE
--PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
--.ENDIF
--
- .IF "$(WITH_LANG)"==""
- FIND_XCU=registry/data
- .ELSE # "$(WITH_LANG)"==""
-@@ -254,7 +248,6 @@ COMPONENT_HELP= \
- # $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
-
- ZIP1DEPS= \
-- $(PACKLICS) \
- $(DESCRIPTION) \
- $(COMPONENT_MANIFEST) \
- $(COMPONENT_FILES) \
-@@ -343,16 +336,6 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
- .ENDIF
-
-
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
-- @@-$(MKDIRHIER) $(@:d)
-- $(GNUCOPY) $< $@
--.ELSE
--$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-- @@-$(MKDIRHIER) $(@:d)
-- $(GNUCOPY) $< $@
--.ENDIF
--
-
- $(ZIP1DIR)/%.xcu : %.xcu
- @@-$(MKDIRHIER) $(@:d)
---
-1.7.0.1
-
diff --git a/patches/dev300/reportdesigner-no-license.diff b/patches/dev300/reportdesigner-no-license.diff
deleted file mode 100644
index 1cf0a38..0000000
--- a/patches/dev300/reportdesigner-no-license.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- reportbuilder/util/description.xml.old 2010-07-22 13:08:24.000000000 +0200
-+++ reportbuilder/util/description.xml 2010-07-29 16:01:08.000000000 +0200
-@@ -6,11 +6,6 @@
- <name lang="en-US">Oracle Report Builder</name>
- <!-- <name lang="en-US">Oracle(TM) Report Builder</name> -->
- </display-name>
-- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-- </simple-license>
-- </registration>
- <version value="#VERSION#"/>
- <identifier value="com.sun.reportdesigner"/>
- <dependencies>
diff --git a/patches/dev300/wiki-publisher-no-license.diff b/patches/dev300/wiki-publisher-no-license.diff
deleted file mode 100644
index 82af63a..0000000
--- a/patches/dev300/wiki-publisher-no-license.diff
+++ /dev/null
@@ -1,78 +0,0 @@
----
- swext/mediawiki/build.xml | 2 --
- swext/mediawiki/src/description.xml | 5 -----
- swext/mediawiki/src/makefile.mk | 18 +-----------------
- 3 files changed, 1 insertions(+), 24 deletions(-)
-
-diff --git swext/mediawiki/build.xml swext/mediawiki/build.xml
-index f991581..74a4573 100644
---- swext/mediawiki/build.xml
-+++ swext/mediawiki/build.xml
-@@ -148,7 +148,6 @@
- <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
- <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
- <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
-- <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
- <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
- </zip>
- </target>
-@@ -171,7 +170,6 @@
- <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/>
- <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
- <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
-- <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/>
- <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>
- </zip>
- </target>
-diff --git swext/mediawiki/src/description.xml swext/mediawiki/src/description.xml
-index 369efc1..7f533d9 100644
---- swext/mediawiki/src/description.xml
-+++ swext/mediawiki/src/description.xml
-@@ -5,11 +5,6 @@
- <display-name>
- <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
- </display-name>
-- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US">
-- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-- </simple-license>
-- </registration>
- <dependencies>
- <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/>
- </dependencies>
-diff --git swext/mediawiki/src/makefile.mk swext/mediawiki/src/makefile.mk
-index ab656fe..8d920ab 100644
---- swext/mediawiki/src/makefile.mk
-+++ swext/mediawiki/src/makefile.mk
-@@ -38,27 +38,11 @@ ENABLE_EXCEPTIONS=TRUE
-
- DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
-
--# .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--# PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/license_$i)
--# .ELSE
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/LICENSE_$i)
--# .ENDIF
--
- common_build_zip=
-
- .INCLUDE : target.mk
-
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
-- @@-$(MKDIRHIER) $(@:d)
-- $(GNUCOPY) $< $@
--.ELSE
--$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-- @@-$(MKDIRHIER) $(@:d)
-- $(GNUCOPY) $< $@
--.ENDIF
--
--ALLTAR: $(PACKLICS) $(DESCRIPTION)
-+ALLTAR: $(DESCRIPTION)
-
- .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
- .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list