[Libreoffice-commits] core.git: 10 commits - configure.ac desktop/Module_desktop.mk desktop/Package_pagein_install.mk extras/Package_glade.mk extras/Package_labels.mk extras/Package_newfiles.mk framework/Package_dtd.mk MathMLDTD/Makefile MathMLDTD/math.dtd MathMLDTD/Module_MathMLDTD.mk MathMLDTD/Package_bin.mk MathMLDTD/README MathMLDTD/w3c_ipr_software_notice.html package/Package_dtd.mk readlicense_oo/html readlicense_oo/odt readlicense_oo/txt RepositoryModule_host.mk scp2/inc scp2/source scripting/Package_scriptproviderforpython.mk sd/Module_sd.mk sd/Package_opengl.mk sd/Package_xml.mk shell/Module_shell.mk shell/Package_scripts_gnome.mk shell/Package_scripts_kde.mk shell/Package_scripts.mk shell/Package_senddoc.mk solenv/gbuild xmloff/Package_dtd.mk xmlscript/Package_dtd.mk
David Tardon
dtardon at redhat.com
Sat May 4 07:53:58 PDT 2013
MathMLDTD/Makefile | 7
MathMLDTD/Module_MathMLDTD.mk | 13
MathMLDTD/Package_bin.mk | 15
MathMLDTD/README | 4
MathMLDTD/math.dtd | 957 ---------------------------
MathMLDTD/w3c_ipr_software_notice.html | 105 --
RepositoryModule_host.mk | 1
configure.ac | 22
desktop/Module_desktop.mk | 1
desktop/Package_pagein_install.mk | 22
extras/Package_glade.mk | 4
extras/Package_labels.mk | 4
extras/Package_newfiles.mk | 4
framework/Package_dtd.mk | 19
package/Package_dtd.mk | 4
readlicense_oo/html/LICENSE.html | 67 -
readlicense_oo/odt/LICENSE.odt |binary
readlicense_oo/txt/license.txt | 55 -
scp2/inc/macros.inc | 11
scp2/source/impress/file_impress.scp | 15
scp2/source/impress/module_impress.scp | 3
scp2/source/impress/module_ogltrans.scp | 6
scp2/source/math/file_math.scp | 10
scp2/source/math/module_math.scp | 2
scp2/source/ooo/file_ooo.scp | 265 +------
scp2/source/ooo/module_hidden_ooo.scp | 39 -
scp2/source/python/file_python.scp | 15
scp2/source/python/module_python.scp | 4
scripting/Package_scriptproviderforpython.mk | 6
sd/Module_sd.mk | 1
sd/Package_opengl.mk | 18
sd/Package_xml.mk | 9
shell/Module_shell.mk | 3
shell/Package_scripts.mk | 11
shell/Package_scripts_gnome.mk | 16
shell/Package_scripts_kde.mk | 16
shell/Package_senddoc.mk | 16
solenv/gbuild/TargetLocations.mk | 2
xmloff/Package_dtd.mk | 37 -
xmlscript/Package_dtd.mk | 12
40 files changed, 229 insertions(+), 1592 deletions(-)
New commits:
commit 08f94626efc530713802f4f97615a5117e8596d2
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 08:21:03 2013 +0200
nuke MathMLDTD
math.dtd was dropped from installation in 2009, see
https://issues.apache.org/ooo/show_bug.cgi?id=97200#c3 :
"In agreement with MIB and MT it was diecided that the Math.dtd should
be removed from the installation set as well since it
a) has incorrect content
b) is no longer used nowadays at all"
Change-Id: Id2a727338c224b0beb4b8def197988ab071a7d94
diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/MathMLDTD/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/MathMLDTD/Module_MathMLDTD.mk b/MathMLDTD/Module_MathMLDTD.mk
deleted file mode 100644
index 584a59f..0000000
--- a/MathMLDTD/Module_MathMLDTD.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#
-
-$(eval $(call gb_Module_Module,MathMLDTD))
-
-$(eval $(call gb_Module_add_targets,MathMLDTD,Package_bin))
diff --git a/MathMLDTD/Package_bin.mk b/MathMLDTD/Package_bin.mk
deleted file mode 100644
index 677997a..0000000
--- a/MathMLDTD/Package_bin.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#
-
-$(eval $(call gb_Package_Package,MathMLDTD_bin,$(SRCDIR)/MathMLDTD))
-
-$(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/math.dtd,math.dtd))
-$(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/w3c_ipr_software_notice.html,w3c_ipr_software_notice.html))
-
diff --git a/MathMLDTD/README b/MathMLDTD/README
deleted file mode 100644
index 68b1072..0000000
--- a/MathMLDTD/README
+++ /dev/null
@@ -1,4 +0,0 @@
-MathMLDTD implements XML Math format.
-
-See also:
-[http://www.w3.org/TR/REC-MathML]
diff --git a/MathMLDTD/math.dtd b/MathMLDTD/math.dtd
deleted file mode 100644
index 0349e30..0000000
--- a/MathMLDTD/math.dtd
+++ /dev/null
@@ -1,957 +0,0 @@
-<!-- Copyright 1997-1999 World Wide Web Consortium, -->
-<!-- (Massachusetts Institute of Technology, -->
-<!-- Institut National de Recherche en Informatique et en Automatique, -->
-<!-- Keio University). All Rights Reserved. -->
-<!-- http://www.w3.org/Consortium/Legal/ -->
-
-<!-- Modified DTD for MathML 1.01 -->
-<!-- -->
-<!-- Original DTD: -->
-<!-- http://www.w3.org/1999/07/REC-MathML-19990707/mmlents.zip -->
-<!-- -->
-<!-- modified 20. June 2001: -->
-<!-- 1) added "math:" namespace prefix -->
-<!-- 2) removed entity include files -->
-<!-- 3) added copyright notice above to comply with -->
-<!-- W3C IPR Software Notice -->
-<!-- 4) added this comment block -->
-<!-- Modifications are intended to ease validation -->
-<!-- of MathML files written by StarMath 6.0 -->
-
-
-<!-- Content model for content and presentation -->
-<!-- and browser interface tags in MathML -->
-<!-- initial draft 9.May.1997 syntax = XML -->
-<!-- author = s.buswell sb at stilo.demon.co.uk -->
-<!-- -->
-<!-- revised 14.May.1997 by Robert Miner -->
-<!-- revised 29.June.1997 and 2.July.1997 by s.buswell -->
-<!-- -->
-<!-- revised 15.December.1997 by s.buswell -->
-<!-- revised 8.February.1998 by s.buswell -->
-<!-- revised 4.april.1998 by s.buswell -->
-<!-- 21.February.1999 entities and small revisions by d.carlisle -->
-<!-- -->
-<!-- W3C Recommendation 7 April 1998 -->
-<!-- ************************************************* -->
-
-<!-- general attribute definitions for class & style & id & other -->
-<!-- : attributes shared by all mathml elements -->
-
-<!ENTITY % att-globalatts 'math:class CDATA #IMPLIED
- math:style CDATA #IMPLIED
- math:id ID #IMPLIED
- math:other CDATA #IMPLIED' >
-
-<!-- ************************************************* -->
-<!-- Presentation element set -->
-
-<!-- presentation attribute definitions -->
-
-<!ENTITY % att-fontsize 'math:fontsize CDATA #IMPLIED' >
-<!ENTITY % att-fontweight 'math:fontweight (normal | bold) #IMPLIED' >
-<!ENTITY % att-fontstyle 'math:fontstyle (normal | italic) #IMPLIED' >
-<!ENTITY % att-fontfamily 'math:fontfamily CDATA #IMPLIED' >
-<!ENTITY % att-color 'math:color CDATA #IMPLIED' >
-
-<!ENTITY % att-fontinfo '%att-fontsize;
- %att-fontweight;
- %att-fontstyle;
- %att-fontfamily;
- %att-color;' >
-
-<!ENTITY % att-form 'math:form (prefix | infix | postfix) #IMPLIED' >
-<!ENTITY % att-fence 'math:fence (true | false ) #IMPLIED' >
-<!ENTITY % att-separator 'math:separator (true | false ) #IMPLIED' >
-<!ENTITY % att-lspace 'math:lspace CDATA #IMPLIED' >
-<!ENTITY % att-rspace 'math:rspace CDATA #IMPLIED' >
-<!ENTITY % att-stretchy 'math:stretchy (true | false ) #IMPLIED' >
-<!ENTITY % att-symmetric 'math:symmetric (true | false ) #IMPLIED' >
-<!ENTITY % att-maxsize 'math:maxsize CDATA #IMPLIED' >
-<!ENTITY % att-minsize 'math:minsize CDATA #IMPLIED' >
-<!ENTITY % att-largeop 'math:largeop (true | false ) #IMPLIED' >
-<!ENTITY % att-movablelimits 'math:movablelimits (true | false )
-#IMPLIED' >
-<!ENTITY % att-accent 'math:accent (true | false) #IMPLIED'>
-
-<!ENTITY % att-opinfo '%att-form;
- %att-fence;
- %att-separator;
- %att-lspace;
- %att-rspace;
- %att-stretchy;
- %att-symmetric;
- %att-maxsize;
- %att-minsize;
- %att-largeop;
- %att-movablelimits;
- %att-accent;' >
-
-<!ENTITY % att-width 'math:width CDATA #IMPLIED' >
-<!ENTITY % att-height 'math:height CDATA #IMPLIED' >
-<!ENTITY % att-depth 'math:depth CDATA #IMPLIED' >
-
-<!ENTITY % att-sizeinfo '%att-width;
- %att-height;
- %att-depth;' >
-
-<!ENTITY % att-lquote 'math:lquote CDATA #IMPLIED' >
-<!ENTITY % att-rquote 'math:rquote CDATA #IMPLIED' >
-
-<!ENTITY % att-linethickness 'math:linethickness CDATA #IMPLIED' >
-
-<!ENTITY % att-scriptlevel 'math:scriptlevel CDATA #IMPLIED'>
-<!ENTITY % att-displaystyle 'math:displaystyle (true | false)
-#IMPLIED'>
-<!ENTITY % att-scriptsizemultiplier 'math:scriptsizemultiplier CDATA
-#IMPLIED' >
-<!ENTITY % att-scriptminsize 'math:scriptminsize CDATA #IMPLIED'>
-<!ENTITY % att-background 'math:background CDATA #IMPLIED' >
-
-<!ENTITY % att-open 'math:open CDATA #IMPLIED' >
-<!ENTITY % att-close 'math:close CDATA #IMPLIED' >
-<!ENTITY % att-separators 'math:separators CDATA #IMPLIED' >
-
-<!ENTITY % att-subscriptshift 'math:subscriptshift CDATA #IMPLIED'>
-<!ENTITY % att-superscriptshift 'math:superscriptshift CDATA #IMPLIED' >
-
-<!ENTITY % att-accentunder 'math:accentunder (true | false)
-#IMPLIED'>
-
-<!ENTITY % att-align 'math:align CDATA #IMPLIED' >
-<!ENTITY % att-rowalign 'math:rowalign CDATA #IMPLIED' >
-<!ENTITY % att-columnalign 'math:columnalign CDATA #IMPLIED' >
-<!ENTITY % att-groupalign 'math:groupalign CDATA #IMPLIED' >
-<!ENTITY % att-alignmentscope 'math:alignmentscope CDATA #IMPLIED' >
-
-<!ENTITY % att-rowspacing 'math:rowspacing CDATA #IMPLIED' >
-<!ENTITY % att-columnspacing 'math:columnspacing CDATA #IMPLIED' >
-<!ENTITY % att-rowlines 'math:rowlines CDATA #IMPLIED' >
-<!ENTITY % att-columnlines 'math:columnlines CDATA #IMPLIED' >
-<!ENTITY % att-frame 'math:frame (none | solid | dashed)
-#IMPLIED' >
-<!ENTITY % att-framespacing 'math:framespacing CDATA #IMPLIED' >
-<!ENTITY % att-equalrows 'math:equalrows CDATA #IMPLIED' >
-<!ENTITY % att-equalcolumns 'math:equalcolumns CDATA #IMPLIED' >
-
-<!ENTITY % att-tableinfo '%att-align;
- %att-rowalign;
- %att-columnalign;
- %att-groupalign;
- %att-alignmentscope;
- %att-rowspacing;
- %att-columnspacing;
- %att-rowlines;
- %att-columnlines;
- %att-frame;
- %att-framespacing;
- %att-equalrows;
- %att-equalcolumns;
- %att-displaystyle;' >
-
-<!ENTITY % att-rowspan 'math:rowspan CDATA #IMPLIED' >
-<!ENTITY % att-columnspan 'math:columnspan CDATA #IMPLIED' >
-
-<!ENTITY % att-edge 'math:edge (left | right) #IMPLIED ' >
-
-<!ENTITY % att-actiontype 'math:actiontype CDATA #IMPLIED' >
-<!ENTITY % att-selection 'math:selection CDATA #IMPLIED ' >
-
-<!-- presentation token schemata with content-->
-
-<!ENTITY % ptoken "math:mi | math:mn | math:mo | math:mtext | math:ms" >
-
-<!ATTLIST math:mi %att-fontinfo;
- %att-globalatts; >
-
-<!ATTLIST math:mn %att-fontinfo;
- %att-globalatts; >
-
-<!ATTLIST math:mo %att-fontinfo;
- %att-opinfo;
- %att-globalatts; >
-
-<!ATTLIST math:mtext %att-fontinfo;
- %att-globalatts; >
-
-<!ATTLIST math:ms %att-fontinfo;
- %att-lquote;
- %att-rquote;
- %att-globalatts; >
-
-<!-- empty presentation token schemata -->
-
-<!ENTITY % petoken "math:mspace" >
-<!ELEMENT math:mspace EMPTY >
-
-<!ATTLIST math:mspace %att-sizeinfo;
- %att-globalatts; >
-
-<!-- presentation general layout schemata -->
-
-<!ENTITY % pgenschema "math:mrow|math:mfrac|math:msqrt|math:mroot|
- math:mstyle|math:merror|math:mpadded| math:mphantom|math:mfenced" >
-
-<!ATTLIST math:mrow %att-globalatts; >
-
-<!ATTLIST math:mfrac %att-linethickness;
- %att-globalatts; >
-
-<!ATTLIST math:msqrt %att-globalatts; >
-
-<!ATTLIST math:mroot %att-globalatts; >
-
-<!ATTLIST math:mstyle %att-fontinfo;
- %att-opinfo;
- %att-lquote;
- %att-rquote;
- %att-linethickness;
- %att-scriptlevel;
- %att-scriptsizemultiplier;
- %att-scriptminsize;
- %att-background;
- %att-open;
- %att-close;
- %att-separators;
- %att-subscriptshift;
- %att-superscriptshift;
- %att-accentunder;
- %att-tableinfo;
- %att-rowspan;
- %att-columnspan;
- %att-edge;
- %att-actiontype;
- %att-selection;
- %att-globalatts; >
-
-<!ATTLIST math:merror %att-globalatts; >
-
-<!ATTLIST math:mpadded %att-sizeinfo;
- %att-lspace;
- %att-globalatts; >
-
-<!ATTLIST math:mphantom %att-globalatts; >
-
-<!ATTLIST math:mfenced %att-open;
- %att-close;
- %att-separators;
- %att-globalatts; >
-
-<!-- presentation layout schemata : scripts and limits -->
-
-<!ENTITY % pscrschema "math:msub|math:msup|math:msubsup|
- math:munder|math:mover|math:munderover|math:mmultiscripts" >
-
-<!ATTLIST math:msub %att-subscriptshift;
- %att-globalatts; >
-
-<!ATTLIST math:msup %att-superscriptshift;
- %att-globalatts; >
-
-<!ATTLIST math:msubsup %att-subscriptshift;
- %att-superscriptshift;
- %att-globalatts; >
-
-<!ATTLIST math:munder %att-accentunder;
- %att-globalatts; >
-
-<!ATTLIST math:mover %att-accent;
- %att-globalatts; >
-
-<!ATTLIST math:munderover %att-accent;
- %att-accentunder;
- %att-globalatts; >
-
-<!ATTLIST math:mmultiscripts
- %att-subscriptshift;
- %att-superscriptshift;
- %att-globalatts; >
-
-<!-- presentation layout schemata: script empty elements -->
-
-<!ENTITY % pscreschema "math:mprescripts|math:none" >
-
-<!ELEMENT math:mprescripts EMPTY >
-<!ATTLIST math:mprescripts %att-globalatts; >
-
-<!ELEMENT math:none EMPTY >
-<!ATTLIST math:none %att-globalatts; >
-
-<!-- presentation layout schemata: tables -->
-
-<!ENTITY % ptabschema "math:mtable|math:mtr|math:mtd" >
-
-<!ATTLIST math:mtable %att-tableinfo;
- %att-globalatts; >
-
-<!ATTLIST math:mtr %att-rowalign;
- %att-columnalign;
- %att-groupalign;
- %att-globalatts; >
-
-<!ATTLIST math:mtd %att-rowalign;
- %att-columnalign;
- %att-groupalign;
- %att-rowspan;
- %att-columnspan;
- %att-globalatts; >
-
-<!ENTITY % plschema "%pgenschema;|%pscrschema;|%ptabschema;" >
-
-<!-- empty presentation layout schemata -->
-
-<!ENTITY % peschema "math:maligngroup | math:malignmark" >
-
-<!ELEMENT math:malignmark EMPTY >
-
-<!ATTLIST math:malignmark %att-edge;
- %att-globalatts; >
-
-<!ELEMENT math:maligngroup EMPTY >
-<!ATTLIST math:maligngroup %att-groupalign;
- %att-globalatts; >
-
-<!-- presentation action schemata -->
-
-<!ENTITY % pactions "math:maction" >
-<!ATTLIST math:maction %att-actiontype;
- %att-selection;
- %att-globalatts; >
-
-<!-- Presentation entity for substitution into content tag constructs -->
-<!-- excludes elements which are not valid as expressions -->
-
-<!ENTITY % PresInCont "%ptoken; | %petoken; |
- %plschema; | %peschema; | %pactions;">
-
-<!-- Presentation entity - all presentation constructs -->
-
-<!ENTITY % Presentation "%ptoken; | %petoken; | %pscreschema; |
- %plschema; | %peschema; | %pactions;">
-
-<!-- ************************************************* -->
-<!-- Content element set -->
-<!-- attribute definitions -->
-
-<!ENTITY % att-base 'math:base CDATA "10"' >
-<!ENTITY % att-closure 'math:closure CDATA "closed"' >
-<!ENTITY % att-definition 'math:definitionURL CDATA ""' >
-<!ENTITY % att-encoding 'math:encoding CDATA ""' >
-<!ENTITY % att-nargs 'math:nargs CDATA "1"' >
-<!ENTITY % att-occurence 'math:occurence CDATA "function-model"' >
-<!ENTITY % att-order 'math:order CDATA "numeric"' >
-<!ENTITY % att-scope 'math:scope CDATA "local"' >
-<!ENTITY % att-type 'math:type CDATA #IMPLIED' >
-
-<!-- content leaf token elements -->
-
-<!ENTITY % ctoken "math:ci | math:cn" >
-
-<!ATTLIST math:ci %att-type;
- %att-globalatts; >
-
-<!ATTLIST math:cn %att-type;
- %att-base;
- %att-globalatts; >
-
-<!-- content elements - specials -->
-
-<!ENTITY % cspecial "math:apply | math:reln | math:lambda" >
-
-<!ATTLIST math:apply %att-globalatts; >
-
-<!ATTLIST math:reln %att-globalatts; >
-
-<!ATTLIST math:lambda %att-globalatts; >
-
-<!-- content elements - others -->
-
-<!ENTITY % cother "math:condition | math:declare | math:sep" >
-
-<!ATTLIST math:condition %att-globalatts; >
-
-<!ATTLIST math:declare %att-type;
- %att-scope;
- %att-nargs;
- %att-occurence;
- %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:sep EMPTY >
-<!ATTLIST math:sep %att-globalatts; >
-
-<!-- content elements - semantic mapping -->
-
-<!ENTITY % csemantics "math:semantics | math:annotation | math:annotation-xml" >
-
-<!ATTLIST math:semantics %att-definition;
- %att-globalatts; >
-
-<!ATTLIST math:annotation %att-encoding;
- %att-globalatts; >
-
-<!ATTLIST math:annotation-xml %att-encoding;
- %att-globalatts; >
-
-<!-- content elements - constructors -->
-
-<!ENTITY % cconstructor "math:interval | math:list | math:matrix | math:matrixrow | math:set |
-math:vector" >
-
-<!ATTLIST math:interval %att-closure;
- %att-globalatts; >
-
-<!ATTLIST math:set %att-globalatts; >
-
-<!ATTLIST math:list %att-order;
- %att-globalatts; >
-
-<!ATTLIST math:vector %att-globalatts; >
-
-<!ATTLIST math:matrix %att-globalatts; >
-
-<!ATTLIST math:matrixrow %att-globalatts; >
-
-<!-- content elements - operators -->
-
-<!ENTITY % cfuncop1ary "math:inverse | math:ident " >
-
-<!ELEMENT math:inverse EMPTY >
-<!ATTLIST math:inverse %att-definition;
- %att-globalatts; >
-
-<!ENTITY % cfuncopnary "math:fn | math:compose" >
-
-<!ATTLIST math:fn %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:ident EMPTY >
-<!ATTLIST math:ident %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:compose EMPTY >
-<!ATTLIST math:compose %att-definition;
- %att-globalatts; >
-
-<!ENTITY % carithop1ary "math:abs | math:conjugate | math:exp | math:factorial" >
-
-<!ELEMENT math:exp EMPTY >
-<!ATTLIST math:exp %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:abs EMPTY >
-<!ATTLIST math:abs %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:conjugate EMPTY >
-<!ATTLIST math:conjugate %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:factorial EMPTY >
-<!ATTLIST math:factorial %att-definition;
- %att-globalatts; >
-
-<!ENTITY % carithop1or2ary "math:minus" >
-
-<!ELEMENT math:minus EMPTY >
-<!ATTLIST math:minus %att-definition;
- %att-globalatts; >
-
-<!ENTITY % carithop2ary "math:quotient | math:divide | math:power | math:rem" >
-
-<!ELEMENT math:quotient EMPTY >
-<!ATTLIST math:quotient %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:divide EMPTY >
-<!ATTLIST math:divide %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:power EMPTY >
-<!ATTLIST math:power %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:rem EMPTY >
-<!ATTLIST math:rem %att-definition;
- %att-globalatts; >
-
-<!ENTITY % carithopnary "math:plus | math:times | math:max | math:min | math:gcd" >
-
-<!ELEMENT math:plus EMPTY >
-<!ATTLIST math:plus %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:max EMPTY >
-<!ATTLIST math:max %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:min EMPTY >
-<!ATTLIST math:min %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:times EMPTY >
-<!ATTLIST math:times %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:gcd EMPTY >
-<!ATTLIST math:gcd %att-definition;
- %att-globalatts; >
-
-<!ENTITY % carithoproot "math:root" >
-
-<!ELEMENT math:root EMPTY >
-<!ATTLIST math:root %att-definition;
- %att-globalatts; >
-
-<!ENTITY % clogicopquant "math:exists | math:forall" >
-
-<!ELEMENT math:exists EMPTY >
-<!ATTLIST math:exists %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:forall EMPTY >
-<!ATTLIST math:forall %att-definition;
- %att-globalatts; >
-
-<!ENTITY % clogicopnary "math:and | math:or | math:xor" >
-
-<!ELEMENT math:and EMPTY >
-<!ATTLIST math:and %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:or EMPTY >
-<!ATTLIST math:or %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:xor EMPTY >
-<!ATTLIST math:xor %att-definition;
- %att-globalatts; >
-
-<!ENTITY % clogicop1ary "math:not" >
-
-<!ELEMENT math:not EMPTY >
-<!ATTLIST math:not %att-definition;
- %att-globalatts; >
-
-<!ENTITY % clogicop2ary "math:implies" >
-
-<!ELEMENT math:implies EMPTY >
-<!ATTLIST math:implies %att-definition;
- %att-globalatts; >
-
-<!ENTITY % ccalcop "math:log | math:int | math:diff | math:partialdiff" >
-
-<!ELEMENT math:log EMPTY >
-<!ATTLIST math:log %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:int EMPTY >
-<!ATTLIST math:int %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:diff EMPTY >
-<!ATTLIST math:diff %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:partialdiff EMPTY >
-<!ATTLIST math:partialdiff %att-definition;
- %att-globalatts; >
-
-<!ENTITY % ccalcop1ary "math:ln" >
-
-<!ELEMENT math:ln EMPTY >
-<!ATTLIST math:ln %att-definition;
- %att-globalatts; >
-
-<!ENTITY % csetop2ary "math:setdiff" >
-
-<!ELEMENT math:setdiff EMPTY >
-<!ATTLIST math:setdiff %att-definition;
- %att-globalatts; >
-
-<!ENTITY % csetopnary "math:union | math:intersect" >
-
-<!ELEMENT math:union EMPTY >
-<!ATTLIST math:union %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:intersect EMPTY >
-<!ATTLIST math:intersect %att-definition;
- %att-globalatts; >
-
-<!ENTITY % cseqop "math:sum | math:product | math:limit" >
-
-<!ELEMENT math:sum EMPTY >
-<!ATTLIST math:sum %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:product EMPTY >
-<!ATTLIST math:product %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:limit EMPTY >
-<!ATTLIST math:limit %att-definition;
- %att-globalatts; >
-
-<!ENTITY % ctrigop "math:sin | math:cos | math:tan | math:sec | math:csc | math:cot | math:sinh
- | math:cosh | math:tanh | math:sech | math:csch | math:coth
- | math:arcsin | math:arccos | math:arctan" >
-
-<!ELEMENT math:sin EMPTY >
-<!ATTLIST math:sin %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:cos EMPTY >
-<!ATTLIST math:cos %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:tan EMPTY >
-<!ATTLIST math:tan %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:sec EMPTY >
-<!ATTLIST math:sec %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:csc EMPTY >
-<!ATTLIST math:csc %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:cot EMPTY >
-<!ATTLIST math:cot %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:sinh EMPTY >
-<!ATTLIST math:sinh %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:cosh EMPTY >
-<!ATTLIST math:cosh %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:tanh EMPTY >
-<!ATTLIST math:tanh %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:sech EMPTY >
-<!ATTLIST math:sech %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:csch EMPTY >
-<!ATTLIST math:csch %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:coth EMPTY >
-<!ATTLIST math:coth %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:arcsin EMPTY >
-<!ATTLIST math:arcsin %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:arccos EMPTY >
-<!ATTLIST math:arccos %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:arctan EMPTY >
-<!ATTLIST math:arctan %att-definition;
- %att-globalatts; >
-
-<!ENTITY % cstatopnary "math:mean | math:sdev | math:variance | math:median | math:mode" >
-
-<!ELEMENT math:mean EMPTY >
-<!ATTLIST math:mean %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:sdev EMPTY >
-<!ATTLIST math:sdev %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:variance EMPTY >
-<!ATTLIST math:variance %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:median EMPTY >
-<!ATTLIST math:median %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:mode EMPTY >
-<!ATTLIST math:mode %att-definition;
- %att-globalatts; >
-
-<!ENTITY % cstatopmoment "math:moment" >
-
-<!ELEMENT math:moment EMPTY >
-<!ATTLIST math:moment %att-definition;
- %att-globalatts; >
-
-<!ENTITY % clalgop1ary "math:determinant | math:transpose" >
-
-<!ELEMENT math:determinant EMPTY >
-<!ATTLIST math:determinant %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:transpose EMPTY >
-<!ATTLIST math:transpose %att-definition;
- %att-globalatts; >
-
-<!ENTITY % clalgopnary "math:selector" >
-
-<!ELEMENT math:selector EMPTY >
-<!ATTLIST math:selector %att-definition;
- %att-globalatts; >
-
-<!-- content elements - relations -->
-
-<!ENTITY % cgenrel2ary "math:neq" >
-
-<!ELEMENT math:neq EMPTY >
-<!ATTLIST math:neq %att-definition;
- %att-globalatts; >
-
-<!ENTITY % cgenrelnary "math:eq | math:leq | math:lt | math:geq | math:gt" >
-
-<!ELEMENT math:eq EMPTY >
-<!ATTLIST math:eq %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:gt EMPTY >
-<!ATTLIST math:gt %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:lt EMPTY >
-<!ATTLIST math:lt %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:geq EMPTY >
-<!ATTLIST math:geq %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:leq EMPTY >
-<!ATTLIST math:leq %att-definition;
- %att-globalatts; >
-
-<!ENTITY % csetrel2ary "math:in | math:notin | math:notsubset | math:notprsubset" >
-
-<!ELEMENT math:in EMPTY >
-<!ATTLIST math:in %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:notin EMPTY >
-<!ATTLIST math:notin %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:notsubset EMPTY >
-<!ATTLIST math:notsubset %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:notprsubset EMPTY >
-<!ATTLIST math:notprsubset %att-definition;
- %att-globalatts; >
-
-<!ENTITY % csetrelnary "math:subset | math:prsubset" >
-
-<!ELEMENT math:subset EMPTY >
-<!ATTLIST math:subset %att-definition;
- %att-globalatts; >
-
-<!ELEMENT math:prsubset EMPTY >
-<!ATTLIST math:prsubset %att-definition;
- %att-globalatts; >
-
-<!ENTITY % cseqrel2ary "math:tendsto" >
-
-<!ELEMENT math:tendsto EMPTY >
-<!ATTLIST math:tendsto %att-definition;
- %att-type;
- %att-globalatts; >
-
-<!-- content elements - quantifiers -->
-
-<!ENTITY % cquantifier "math:lowlimit | math:uplimit | math:bvar | math:degree | math:logbase" >
-
-<!ATTLIST math:lowlimit %att-globalatts; >
-
-<!ATTLIST math:uplimit %att-globalatts; >
-
-<!ATTLIST math:bvar %att-globalatts; >
-
-<!ATTLIST math:degree %att-globalatts; >
-
-<!ATTLIST math:logbase %att-globalatts; >
-
-<!-- operator groups -->
-
-<!ENTITY % cop1ary "%cfuncop1ary; | %carithop1ary; | %clogicop1ary;
- | %ccalcop1ary; | %ctrigop; | %clalgop1ary; " >
-
-<!ENTITY % cop2ary "%carithop2ary; | %clogicop2ary;| %csetop2ary; " >
-
-<!ENTITY % copnary "%cfuncopnary; | %carithopnary; | %clogicopnary;
- | %csetopnary; | %cstatopnary; | %clalgopnary; " >
-
-<!ENTITY % copmisc "%carithoproot; | %carithop1or2ary; | %ccalcop;
- | %cseqop; | %cstatopmoment; | %clogicopquant;" >
-
-<!-- relation groups -->
-
-<!ENTITY % crel2ary "%cgenrel2ary; | %csetrel2ary; | %cseqrel2ary; " >
-
-<!ENTITY % crelnary "%cgenrelnary; | %csetrelnary;" >
-
-<!-- content constructs - all -->
-
-<!ENTITY % Content "%ctoken; | %cspecial; | %cother; | %csemantics;
- |%cconstructor; | %cquantifier;
- |%cop1ary; |%cop2ary; |%copnary; |%copmisc;
- |%crel2ary; |%crelnary;" >
-
-<!-- content constructs for substitution in presentation structures -->
-
-<!ENTITY % ContInPres "math:ci | math:cn | math:apply | math:fn | math:lambda | math:reln
- | math:interval | math:list | math:matrix |math:matrixrow
- | math:set | math:vector | math:semantics" > <!--dpc-->
-
-<!-- ************************************************* -->
-
-<!-- recursive definition for content of expressions -->
-<!-- include presentation tag constructs at lowest level -->
-<!-- so presentation layout schemata hold presentation or Content -->
-<!-- include Content tag constructs at lowest level -->
-<!-- so Content tokens hold PCDATA or Presentation at leaf level -->
-<!-- (for permitted substitutable elements in context) -->
-
-<!ENTITY % ContentExpression "(%Content; | %PresInCont;)* " >
-<!ENTITY % PresExpression "(%Presentation; | %ContInPres;)* " >
-<!ENTITY % MathExpression "(%PresInCont; | %ContInPres;)* " >
-
-<!-- content token elements (may hold embedded presentation constructs)
--->
-
-<!ELEMENT math:ci (#PCDATA | %PresInCont;)* >
-<!ELEMENT math:cn (#PCDATA | math:sep | %PresInCont;)* >
-
-<!-- content special elements -->
-
-<!ELEMENT math:apply (%ContentExpression;) >
-<!ELEMENT math:reln (%ContentExpression;) >
-<!ELEMENT math:lambda (%ContentExpression;) >
-
-<!-- content other elements -->
-
-<!ELEMENT math:condition (%ContentExpression;) >
-<!ELEMENT math:declare (%ContentExpression;) >
-
-<!-- content semantics elements -->
-
-<!ELEMENT math:semantics (%ContentExpression;) >
-<!ELEMENT math:annotation (#PCDATA) >
-<!ELEMENT math:annotation-xml (%ContentExpression;) >
-
-<!-- content constructor elements -->
-
-<!ELEMENT math:interval (%ContentExpression;) >
-<!ELEMENT math:set (%ContentExpression;) >
-<!ELEMENT math:list (%ContentExpression;) >
-<!ELEMENT math:vector (%ContentExpression;) >
-<!ELEMENT math:matrix (%ContentExpression;) >
-<!ELEMENT math:matrixrow (%ContentExpression;) >
-
-<!-- content operator element (user-defined) -->
-
-<!ELEMENT math:fn (%ContentExpression;) >
-
-<!-- content quantifier elements -->
-
-<!ELEMENT math:lowlimit (%ContentExpression;) >
-<!ELEMENT math:uplimit (%ContentExpression;) >
-<!ELEMENT math:bvar (%ContentExpression;) >
-<!ELEMENT math:degree (%ContentExpression;) >
-<!ELEMENT math:logbase (%ContentExpression;) >
-
-<!-- ************************************************* -->
-<!-- presentation layout schema contain tokens, layout and content
-schema -->
-
-<!ELEMENT math:mstyle (%PresExpression;) >
-<!ELEMENT math:merror (%PresExpression;) >
-<!ELEMENT math:mphantom (%PresExpression;) >
-<!ELEMENT math:mrow (%PresExpression;) >
-<!ELEMENT math:mfrac (%PresExpression;) >
-<!ELEMENT math:msqrt (%PresExpression;) >
-<!ELEMENT math:mroot (%PresExpression;) >
-<!ELEMENT math:msub (%PresExpression;) >
-<!ELEMENT math:msup (%PresExpression;) >
-<!ELEMENT math:msubsup (%PresExpression;) >
-<!ELEMENT math:mmultiscripts (%PresExpression;) >
-<!ELEMENT math:munder (%PresExpression;) >
-<!ELEMENT math:mover (%PresExpression;) >
-<!ELEMENT math:munderover (%PresExpression;) >
-<!ELEMENT math:mtable (%PresExpression;) >
-<!ELEMENT math:mtr (%PresExpression;) >
-<!ELEMENT math:mtd (%PresExpression;) >
-<!ELEMENT math:maction (%PresExpression;) >
-<!ELEMENT math:mfenced (%PresExpression;) >
-<!ELEMENT math:mpadded (%PresExpression;) >
-
-<!-- presentation tokens contain PCDATA or malignmark constructs -->
-
-<!ELEMENT math:mi (#PCDATA | math:malignmark )* >
-<!ELEMENT math:mn (#PCDATA | math:malignmark )* >
-<!ELEMENT math:mo (#PCDATA | math:malignmark )* >
-<!ELEMENT math:mtext (#PCDATA | math:malignmark )* >
-<!ELEMENT math:ms (#PCDATA | math:malignmark )* >
-
-<!-- ************************************************* -->
-<!-- browser interface definition -->
-
-<!-- attributes for top level math element -->
-
-<!ENTITY % att-macros 'math:macros CDATA #IMPLIED' >
-<!ENTITY % att-mode 'math:mode CDATA #IMPLIED' >
-
-<!ENTITY % att-topinfo '%att-globalatts;
- %att-macros;
- %att-mode;' >
-
-<!-- attributes for browser interface element element -->
-
-<!ENTITY % att-name 'math:name CDATA #IMPLIED' >
-<!ENTITY % att-baseline 'math:baseline CDATA #IMPLIED' >
-<!ENTITY % att-overflow 'math:overflow
-(scroll|elide|truncate|scale) "scroll"' >
-<!ENTITY % att-altimg 'math:altimg CDATA #IMPLIED' >
-<!ENTITY % att-alttext 'math:alttext CDATA #IMPLIED' >
-
-<!ENTITY % att-browif '%att-type;
- %att-name;
- %att-height;
- %att-width;
- %att-baseline;
- %att-overflow;
- %att-altimg;
- %att-alttext; ' >
-
-<!-- the top level math element -->
-<!-- math contains MathML encoded mathematics -->
-<!-- math has the browser info attributes iff it is the
- browser interface element also -->
-
-<!ELEMENT math:math (%MathExpression;) >
-
-<!ATTLIST math:math %att-topinfo;
- %att-browif; >
-
-
-<!-- ENTITY sets -->
-
-<!-- ... removed ... -->
-
-
-<!-- MathML new characters -->
-
-<!-- ... removed ... -->
-
-<!-- end of ENTITY sets -->
-<!-- end of DTD fragment -->
-<!-- ************************************************* -->
diff --git a/MathMLDTD/w3c_ipr_software_notice.html b/MathMLDTD/w3c_ipr_software_notice.html
deleted file mode 100644
index 3a4ed53..0000000
--- a/MathMLDTD/w3c_ipr_software_notice.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-
-<!-- W3C IPR SOFTWARE NOTICE -->
-<!-- downloaded from: -->
-<!-- http://www.w3.org/Consortium/Legal/copyright-software-19980720 -->
-<!-- -->
-<!-- Changed: 24. July 2001 -->
-<!-- 1) removed link to stylesheet -->
-<!-- 2) removed "webmaster" link -->
-<!-- 3) changed site-relative URLs to absolute URLs -->
-<!-- 4) added this comment block -->
-<!-- Changes are intended to allow proper -->
-<!-- off-line viewing of the license. -->
-
-<html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<title>W3C IPR SOFTWARE NOTICE</title>
-</head>
-<body text="#000000" bgcolor="#FFFFFF">
-<h1>W3C<sup>®</sup> SOFTWARE NOTICE AND LICENSE</h1>
-
-<h3>Copyright © 1994-2001 <a href="http://www.w3.org/">World
-Wide Web Consortium</a>, (<a href=
-"http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href=
-"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/</h3>
-
-<p>This W3C work (including software, documents, or other related
-items) is being provided by the copyright holders under the
-following license. By obtaining, using and/or copying this work,
-you (the licensee) agree that you have read, understood, and will
-comply with the following terms and conditions:</p>
-
-<p>Permission to use, copy, modify, and distribute this software
-and its documentation, with or without modification, for any
-purpose and without fee or royalty is hereby granted, provided that
-you include the following on ALL copies of the software and
-documentation or portions thereof, including modifications, that
-you make:</p>
-
-<ol>
-<li>The full text of this NOTICE in a location viewable to users of
-the redistributed or derivative work.</li>
-
-<li>Any pre-existing intellectual property disclaimers, notices, or
-terms and conditions. If none exist, a short notice of the
-following form (hypertext is preferred, text is permitted) should
-be used within the body of any redistributed or derivative code:
-"Copyright © [$date-of-software] <a href="http://www.w3.org/">
-World Wide Web Consortium</a>, (<a href=
-"http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href=
-"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/"</li>
-
-<li>Notice of any changes or modifications to the W3C files,
-including the date changes were made. (We recommend you provide
-URIs to the location from which the code is derived.)</li>
-</ol>
-
-<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
-
-<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-SOFTWARE OR DOCUMENTATION.</p>
-
-<p>The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without
-specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain
-with copyright holders.</p>
-
-<p>____________________________________</p>
-
-<p>This formulation of W3C's notice and license became active on
-August 14 1998 so as to improve compatibility with GPL. This
-version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be
-distributed in GPL packages. See the <a href=
-"http://www.w3.org/Consortium/Legal/copyright-software-19980519.html">older formulation</a> for the
-policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">
-Copyright FAQ</a> for common questions about using materials from
-our site, including specific terms and conditions for packages like
-libwww, Amaya, and Jigsaw. Other questions about this notice can be
-directed to <a href="mailto:site-policy at w3.org">
-site-policy at w3.org</a>.<br>
- </p>
-
-<p> </p>
-
-</body>
-</html>
-
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index d17a73b..9772abe 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
$(call gb_Helper_optional,MARIADB,libmariadb) \
- MathMLDTD \
$(call gb_Helper_optional,MDDS,mdds) \
Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
diff --git a/configure.ac b/configure.ac
index 41dd1cd..d8fd6df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -768,11 +768,6 @@ AC_ARG_ENABLE(mpl-subset,
[Don't compile any pieces which are not MPL or more liberrally licensed])
)
-AC_ARG_ENABLE(mathmldtd,
- AS_HELP_STRING([--enable-mathmldtd],
- [Enable bundling of (modified) MathML 1.01 DTD.])
-)
-
AC_ARG_ENABLE(evolution2,
AS_HELP_STRING([--enable-evolution2],
[Allows the built-in evolution 2 addressbook connectivity build to be
@@ -10653,23 +10648,6 @@ fi
AC_SUBST(ENABLE_KAB)
dnl ===================================================================
-dnl Test whether to include MathMLDTD
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include MathMLDTD])
-if test -n "$enable_mathmldtd"; then
- if test "$enable_mathmldtd" = "no"; then
- AC_MSG_RESULT([no])
- SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
- else
- AC_MSG_RESULT([yes])
- BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
- fi
-else
- AC_MSG_RESULT([no])
- SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
-fi
-
-dnl ===================================================================
dnl Test which themes to include
dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index af2273c..c845be8 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -5232,71 +5232,6 @@ shall not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission. Hewlett-Packard Company makes no representations about
the suitability of this software for any purpose.</P>
-<H2 CLASS="western">MathML DTD</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: MathML DTD. Use
-of any of this software is governed by the terms of the license
-below:</P>
-<H3 CLASS="western">W3C<SUP>®</SUP> SOFTWARE NOTICE AND LICENSE</H3>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><SPAN STYLE="font-weight: normal">Copyright
-© 1994-2001 </SPAN><A HREF="http://www.w3.org/"><SPAN STYLE="font-weight: normal">World
-Wide Web Consortium</SPAN></A><SPAN STYLE="font-weight: normal">,
-(</SPAN><A HREF="http://www.lcs.mit.edu/"><SPAN STYLE="font-weight: normal">Massachusetts
-Institute of Technology</SPAN></A><SPAN STYLE="font-weight: normal">,
-</SPAN><A HREF="http://www.inria.fr/"><SPAN STYLE="font-weight: normal">Institut
-National de Recherche en Informatique et en Automatique</SPAN></A><SPAN STYLE="font-weight: normal">,
-</SPAN><A HREF="http://www.keio.ac.jp/"><SPAN STYLE="font-weight: normal">Keio
-University</SPAN></A><SPAN STYLE="font-weight: normal">). All Rights
-Reserved. </SPAN><A HREF="http://www.w3.org/Consortium/Legal/"><SPAN STYLE="font-weight: normal">http://www.w3.org/Consortium/Legal/</SPAN></A></P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
-W3C work (including software, documents, or other related items) is
-being provided by the copyright holders under the following license.
-By obtaining, using and/or copying this work, you (the licensee)
-agree that you have read, understood, and will comply with the
-following terms and conditions:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Permission
-to use, copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose
-and without fee or royalty is hereby granted, provided that you
-include the following on ALL copies of the software and documentation
-or portions thereof, including modifications, that you make:</P>
-<OL>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Any pre-existing intellectual property disclaimers, notices, or
- terms and conditions. If none exist, a short notice of the following
- form (hypertext is preferred, text is permitted) should be used
- within the body of any redistributed or derivative code: "Copyright
- © [$date-of-software] <A HREF="http://www.w3.org/">World Wide Web
- Consortium</A>, (<A HREF="http://www.lcs.mit.edu/">Massachusetts
- Institute of Technology</A>, <A HREF="http://www.inria.fr/">Institut
- National de Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio
- University</A>). All Rights Reserved.
- <A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A>"</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Notice of any changes or modifications to the W3C files, including
- the date changes were made. (We recommend you provide URIs to the
- location from which the code is derived.)</P>
-</OL>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THIS
-SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY
-OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE
-OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
-COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">COPYRIGHT
-HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright
-holders.</P>
<H1 CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12227_1300998327"></A><A NAME="2.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="4.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAM
E="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public Licens
e Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A>
GNU Lesser General Public License Version 3</H1>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
@@ -9524,4 +9459,4 @@ this trademark restriction does not form part of the License.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Creative
Commons may be contacted at <A HREF="http://creativecommons.org/">http://creativecommons.org/</A>.</P>
</BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt
index ae4fa11..5212443 100644
Binary files a/readlicense_oo/odt/LICENSE.odt and b/readlicense_oo/odt/LICENSE.odt differ
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index b0c1375..6b26527 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -5260,61 +5260,6 @@ International Color Consortium sRGB Profiles
makes no representations about the suitability of this software for any
purpose.
-MathML DTD
-
- The following software may be included in this product: MathML DTD. Use
- of any of this software is governed by the terms of the license below:
-
- W3C^® SOFTWARE NOTICE AND LICENSE
-
- Copyright © 1994-2001 World Wide Web Consortium,
- (Massachusetts Institute of Technology, Institut National de
- Recherche en Informatique et en Automatique, Keio University). All
- Rights Reserved. http://www.w3.org/Consortium/Legal/
-
- This W3C work (including software, documents, or other related items)
- is being provided by the copyright holders under the following license.
- By obtaining, using and/or copying this work, you (the licensee) agree
- that you have read, understood, and will comply with the following
- terms and conditions:
-
- Permission to use, copy, modify, and distribute this software and its
- documentation, with or without modification, for any purpose and
- without fee or royalty is hereby granted, provided that you include the
- following on ALL copies of the software and documentation or portions
- thereof, including modifications, that you make:
- 1. The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
- 2. Any pre-existing intellectual property disclaimers, notices, or
- terms and conditions. If none exist, a short notice of the
- following form (hypertext is preferred, text is permitted) should
- be used within the body of any redistributed or derivative code:
- "Copyright © [$date-of-software] World Wide Web Consortium,
- (Massachusetts Institute of Technology, Institut National
- de Recherche en Informatique et en Automatique, Keio
- University). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/"
- 3. Notice of any changes or modifications to the W3C files, including
- the date changes were made. (We recommend you provide URIs to the
- location from which the code is derived.)
-
- THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
- HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
- INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
- DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- TRADEMARKS OR OTHER RIGHTS.
-
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
- OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
- DOCUMENTATION.
-
- The name and trademarks of copyright holders may NOT be used in
- advertising or publicity pertaining to the software without specific,
- written prior permission. Title to copyright in this software and any
- associated documentation will at all times remain with copyright
- holders.
-
GNU Lesser General Public License Version 3
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index aa0fcb3..455c9ca 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -27,16 +27,6 @@
#include "macros.inc"
-#ifndef WITHOUT_MATHMLDTD
-File gid_File_Html_W3c_Ipr
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Math_1_01;
- Name = "w3c_ipr_software_notice.html";
-End
-
-#endif
-
STD_LIB_FILE( gid_File_Lib_Sm , sm)
STD_LIB_FILE( gid_File_Lib_Smd , smd)
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 960c320..f222441 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -42,7 +42,7 @@ Module gid_Module_Prg_Math_Bin
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+ Files = (gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
gid_File_Share_Registry_Math_Xcd,
gid_File_Tmp_Userinstall_Math_Inf);
End
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index a66e11e..ff0ae8f 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -99,6 +99,7 @@ gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CppunitTestFakeExecutable_get_target = \
$(OUTDIR)/unittest/install/program/$(1)
+gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
@@ -266,6 +267,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
CliNativeLibraryTarget \
CliUnoApiTarget \
ComponentTarget \
+ CustomPackage \
DescriptionTranslateTarget \
Dictionary \
ExternalPackage \
commit c35f495a8d608cb71b48838a00c06db5d0e4e2dd
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 10:19:59 2013 +0200
copy pagein-* into instdir
Change-Id: Iab77db4f7841fd3d118fc371de5d0368f08f6c2d
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 751fcf7..40e4f62 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_migrationoo2 \
Library_migrationoo3 \
Library_unopkgapp \
+ $(if $(gb_RUNNABLE_INSTDIR),Package_pagein_install) \
Package_scripts \
Pagein_calc \
Pagein_common \
diff --git a/desktop/Package_pagein_install.mk b/desktop/Package_pagein_install.mk
new file mode 100644
index 0000000..afaff5c
--- /dev/null
+++ b/desktop/Package_pagein_install.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,desktop_pagein_install,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,desktop_pagein_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,desktop_pagein_install,program,\
+ pagein-calc \
+ pagein-common \
+ pagein-draw \
+ pagein-impress \
+ pagein-writer \
+))
+
+# vim: set noet sw=4 ts=4:
commit fc02abac9c18d441a9f08db86990d8f51e4e6500
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 09:54:24 2013 +0200
install xmlscript DTDs using filelist
Change-Id: Ie773f7af8823534e9d4834733b4852cb9ad314ae
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index fdeeb1f..a52f78b 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -249,25 +249,11 @@ File gid_File_framework_dtd
Name = "framework_dtd.filelist";
End
-File gid_File_Dtd_Dialog
+File gid_File_xmlscript_dtd
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "dialog.dtd";
-End
-
-File gid_File_Dtd_Libraries
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "libraries.dtd";
-End
-
-File gid_File_Dtd_Library
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "library.dtd";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "xmlscript_dtd.filelist";
End
File gid_File_Dtd_Manifest
@@ -277,13 +263,6 @@ File gid_File_Dtd_Manifest
Name = "package_dtd.filelist";
End
-File gid_File_Dtd_Module
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "module.dtd";
-End
-
STD_RES_FILE( gid_File_Res_Eps, eps )
File gid_File_Help_Help_Zip
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 6244a16..dc538fa 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -404,11 +404,8 @@ Module gid_Module_Root_Files_6
gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
gid_File_framework_dtd,
- gid_File_Dtd_Dialog,
- gid_File_Dtd_Libraries,
- gid_File_Dtd_Library,
+ gid_File_xmlscript_dtd,
gid_File_Dtd_Manifest,
- gid_File_Dtd_Module,
gid_File_xmloff_dtd,
gid_File_officecfg_misc,
gid_File_Share_Glade_Xml,
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
index 60e8871..b4cfd31 100644
--- a/xmlscript/Package_dtd.mk
+++ b/xmlscript/Package_dtd.mk
@@ -9,9 +9,13 @@
$(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/dialog.dtd,dtd/dialog.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/libraries.dtd,dtd/libraries.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/library.dtd,dtd/library.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/module.dtd,dtd/module.dtd))
+$(eval $(call gb_Package_set_outdir,xmlscript_dtd,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,xmlscript_dtd,share/dtd/officedocument/1_0,\
+ dtd/dialog.dtd \
+ dtd/libraries.dtd \
+ dtd/library.dtd \
+ dtd/module.dtd \
+))
# vim: set noet sw=4 ts=4:
commit 6514956d4239f77d3cba34fd06aab5f1001e05de
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 09:07:16 2013 +0200
install scripts from shell using filelists
The FILELIST install method is really tailored to large sets of closely
related files. It is not such a great idea to apply it just to move some
unrelated files, delivered from a single module, out of $(OUTDIR), like
here, because it requires splitting one Package to several to allow the
files to be placed to different installation modules in scp2. The extra
makefile increases the overhead needed to place a file into an
installation set. We really need a better way to handle this...
Change-Id: I2f271562d8773152e69d284b4fe8ae356dea0945
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index feed1ce..fdeeb1f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -172,24 +172,13 @@ End
#endif
-#ifdef UNX
-
-File gid_File_Bin_Open_Url
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "open-url";
- Styles = (PACKED);
-End
-
-#endif
-
#if defined UNX && ! defined MACOSX
File gid_File_Bin_Gnome_Open_Url
BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "gnome-open-url";
- Styles = (PACKED);
+ Dir = FILELIST_DIR;
+ Name = "shell_scripts_gnome.filelist";
+ Styles = (FILELIST, PACKED);
End
File gid_File_Bin_Gnome_Open_Url_Bin
@@ -199,25 +188,18 @@ File gid_File_Bin_Gnome_Open_Url_Bin
Styles = (PACKED);
End
-File gid_File_Bin_Tde_Open_Url
+File gid_File_shell_scripts
BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "tde-open-url";
- Styles = (PACKED);
+ Dir = FILELIST_DIR;
+ Name = "shell_scripts.filelist";
+ Styles = (FILELIST, PACKED);
End
File gid_File_Bin_Kde_Open_Url
BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "kde-open-url";
- Styles = (PACKED);
-End
-
-File gid_File_Bin_Cde_Open_Url
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "cde-open-url";
- Styles = (PACKED);
+ Dir = FILELIST_DIR;
+ Name = "shell_scripts_kde.filelist";
+ Styles = (FILELIST, PACKED);
End
#endif
@@ -233,17 +215,21 @@ End
#endif
+#ifdef UNX
+File gid_File_Bin_Senddoc
+ BIN_FILE_BODY;
+ Dir = FILELIST_DIR;
+ Name = "shell_senddoc.filelist";
+ Styles = (FILELIST, PACKED);
+End
+#else
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
- #ifdef UNX
- Name = "senddoc";
- Styles = (PACKED);
- #else
Name = "senddoc.exe";
Styles = (PACKED);
- #endif
End
+#endif
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index af3bc1b..6244a16 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -89,10 +89,7 @@ Module gid_Module_Root_Files_2
Sortkey = "1200";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Bin_Cde_Open_Url,
- gid_File_Bin_Tde_Open_Url,
- gid_File_Bin_Kde_Open_Url,
- gid_File_Bin_Open_Url,
+ Files = (gid_File_shell_scripts,
gid_File_Bin_Pluginapp,
gid_File_Bin_Senddoc,
gid_File_Bin_Gengal,
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 5f93640..ecd3772 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -107,6 +107,9 @@ $(eval $(call gb_Module_add_targets,shell,\
Library_cmdmail \
Library_syssh \
Package_scripts \
+ Package_scripts_gnome \
+ Package_scripts_kde \
+ Package_senddoc \
StaticLibrary_xmlparser \
))
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index ac04021..a794e3e 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -9,11 +9,10 @@
$(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/cde-open-url,cde-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/gnome-open-url,gnome-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/kde-open-url,kde-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/open-url,open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/senddoc,senddoc.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/tde-open-url,tde-open-url.sh))
+$(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_scripts,program/cde-open-url,cde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,program/open-url,open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,program/tde-open-url,tde-open-url.sh))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
new file mode 100644
index 0000000..a9737e5
--- /dev/null
+++ b/shell/Package_scripts_gnome.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc))
+
+$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_scripts_gnome,program/gnome-open-url,gnome-open-url.sh))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
new file mode 100644
index 0000000..95f1598
--- /dev/null
+++ b/shell/Package_scripts_kde.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
+
+$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_scripts_kde,program/kde-open-url,kde-open-url.sh))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk
new file mode 100644
index 0000000..c94cb8a
--- /dev/null
+++ b/shell/Package_senddoc.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,shell_senddoc,$(SRCDIR)/shell/source/unix/misc))
+
+$(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_senddoc,program/senddoc,senddoc.sh))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit d7f00e2e8aa4f91c340f3f7c4856259abee13b16
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 08:17:51 2013 +0200
install package DTD using filelist
Change-Id: I5c0ec48ecd8616358b728d426bc5ef91aa6b08e3
diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk
index 7fd963e..a318f76 100644
--- a/package/Package_dtd.mk
+++ b/package/Package_dtd.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd))
-$(eval $(call gb_Package_add_file,package_dtd,bin/Manifest.dtd,Manifest.dtd))
+$(eval $(call gb_Package_set_outdir,package_dtd,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,package_dtd,share/dtd/officedocument/1_0/Manifest.dtd,Manifest.dtd))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 56a03d8..feed1ce 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -286,9 +286,9 @@ End
File gid_File_Dtd_Manifest
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "Manifest.dtd";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "package_dtd.filelist";
End
File gid_File_Dtd_Module
commit cb8066dcc9655878656865ecb61a611a0e3bce95
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 08:14:56 2013 +0200
install framework DTDs using filelist
Change-Id: I7a36eb26d26dfa58b82919ca0ee16f94fa82c220
diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk
index 2b03fc1..86973ee 100644
--- a/framework/Package_dtd.mk
+++ b/framework/Package_dtd.mk
@@ -18,12 +18,17 @@
#
$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd))
+
+$(eval $(call gb_Package_set_outdir,framework_dtd,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,framework_dtd,share/dtd/officedocument/1_0,\
+ accelerator.dtd \
+ event.dtd \
+ groupuinames.dtd \
+ image.dtd \
+ menubar.dtd \
+ statusbar.dtd \
+ toolbar.dtd \
+))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6fedf2a..56a03d8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -256,11 +256,11 @@ End
#endif
-File gid_File_Dtd_Accelerator
+File gid_File_framework_dtd
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "accelerator.dtd";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "framework_dtd.filelist";
End
File gid_File_Dtd_Dialog
@@ -270,27 +270,6 @@ File gid_File_Dtd_Dialog
Name = "dialog.dtd";
End
-File gid_File_Dtd_Event
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "event.dtd";
-End
-
-File gid_File_Dtd_Groupuinames
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "groupuinames.dtd";
-End
-
-File gid_File_Dtd_Image
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "image.dtd";
-End
-
File gid_File_Dtd_Libraries
TXT_FILE_BODY;
Styles = (PACKED);
@@ -312,13 +291,6 @@ File gid_File_Dtd_Manifest
Name = "Manifest.dtd";
End
-File gid_File_Dtd_Menubar
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "menubar.dtd";
-End
-
File gid_File_Dtd_Module
TXT_FILE_BODY;
Styles = (PACKED);
@@ -326,20 +298,6 @@ File gid_File_Dtd_Module
Name = "module.dtd";
End
-File gid_File_Dtd_Statusbar
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "statusbar.dtd";
-End
-
-File gid_File_Dtd_Toolbar
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "toolbar.dtd";
-End
-
STD_RES_FILE( gid_File_Res_Eps, eps )
File gid_File_Help_Help_Zip
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 47e61d8..af3bc1b 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -406,18 +406,12 @@ Module gid_Module_Root_Files_6
gid_File_Share_Config_Sofficecfg_uiconfig_uui,
gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
- gid_File_Dtd_Accelerator,
+ gid_File_framework_dtd,
gid_File_Dtd_Dialog,
- gid_File_Dtd_Event,
- gid_File_Dtd_Groupuinames,
- gid_File_Dtd_Image,
gid_File_Dtd_Libraries,
gid_File_Dtd_Library,
gid_File_Dtd_Manifest,
- gid_File_Dtd_Menubar,
gid_File_Dtd_Module,
- gid_File_Dtd_Statusbar,
- gid_File_Dtd_Toolbar,
gid_File_xmloff_dtd,
gid_File_officecfg_misc,
gid_File_Share_Glade_Xml,
commit 233e12168b8ebc3cf6434e9b1143a54fd67e4a71
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 08:08:49 2013 +0200
install python scripting provider using filelist
Change-Id: I9db93fd588f1cca9ce071d4ff14d5c9c699748a0
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 6684204..1c75490 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -29,18 +29,11 @@
#ifndef DISABLE_PYUNO
-File gid_File_Py_Pythonscript
+File gid_File_scriptproviderforpython
TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "pythonscript.py";
- Styles = (PACKED);
-End
-
-File gid_File_Rdb_Scriptproviderforpython
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program_Services;
- Name = "scriptproviderforpython.rdb";
- Styles = (PACKED);
+ Dir = FILELIST_DIR;
+ Name = "scriptproviderforpython.filelist";
+ Styles = (FILELIST, PACKED);
End
File gid_File_Lib_Pyuno
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index a7288cd..61451cf 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -81,9 +81,7 @@ End
Module gid_Module_Script_Provider_For_Python
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand;
- Files = (
- gid_File_Py_Pythonscript,
- gid_File_Rdb_Scriptproviderforpython );
+ Files = ( gid_File_scriptproviderforpython );
Default = YES;
Styles = (HIDDEN_ROOT);
End
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index 641c3cb..29830a0 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
-$(eval $(call gb_Package_add_file,scriptproviderforpython,xml/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
-$(eval $(call gb_Package_add_file,scriptproviderforpython,bin/pythonscript.py,pythonscript.py))
+$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,scriptproviderforpython,program/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
+$(eval $(call gb_Package_add_file,scriptproviderforpython,program/pythonscript.py,pythonscript.py))
# vim: set noet sw=4 ts=4:
commit 2dcf42b417c6246a5f6d14e8297510c751b1da96
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 08:03:56 2013 +0200
install data files from extras using filelists
Change-Id: Ib092623501e36fa759a5215a435d21e1fea8dfdd
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 1ac1f69..00b818f 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
-$(eval $(call gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml))
+$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extras_glade,share/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk
index 6291b13..24ff865 100644
--- a/extras/Package_labels.mk
+++ b/extras/Package_labels.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels))
-$(eval $(call gb_Package_add_file,extras_labels,pck/labels.xml,labels.xml))
+$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extras_labels,share/labels/labels.xml,labels.xml))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk
index cf457d9..aebad89 100644
--- a/extras/Package_newfiles.mk
+++ b/extras/Package_newfiles.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew))
-$(eval $(call gb_Package_add_files,extras_newfiles,pck,\
+$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_newfiles,share/template/shellnew,\
soffice.odg \
soffice.odp \
soffice.ods \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 6ff7959..405da24 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -161,17 +161,6 @@
#define JARFILENAME(name) STRING(CONCAT2(name,.jar))
-#define PACKED_SHELLNEW_FILE_BODY \
- TXT_FILE_BODY; \
- Styles = (PACKED,WORKSTATION, OVERWRITE); \
- Dir = gid_Dir_Shellnew
-
-#define STD_SHELLNEW_FILE(id,name) \
- File id \
- PACKED_SHELLNEW_FILE_BODY; \
- Name = STRING(name) ; \
- End
-
#define SPECIAL_COMPONENT_LIB_FILE(id,name) \
File id \
Name = SPECIAL_COMPONENT_LIB_NAME(name); \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 759b677..6fedf2a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -506,16 +506,16 @@ End
File gid_File_Share_Labels_Xml
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Labels;
- Name = "labels.xml";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "extras_labels.filelist";
End
File gid_File_Share_Glade_Xml
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Glade;
- Name = "libreoffice-catalog.xml";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "extras_glade.filelist";
End
File gid_File_Share_Registry_Main_Xcd
@@ -710,10 +710,12 @@ UI_FILELIST_ALL_LANG(xmlsec, UIConfig/xmlsec, filelist)
#ifdef WNT
-STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
+File gid_File_extras_newfiles
+ TXT_FILE_BODY;
+ Styles = (FILELIST, PACKED, WORKSTATION, OVERWRITE);
+ Dir = FILELIST_DIR;
+ Name = "extras_newfiles.filelist";
+End
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 5a429f8..47e61d8 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -107,10 +107,7 @@ Module gid_Module_Root_Files_2
gid_File_Txt_Pagein_Draw,
gid_File_Txt_Pagein_Impress,
gid_File_Txt_Pagein_Writer,
- gid_File_Shellnew_Ods_Soffice,
- gid_File_Shellnew_Odg_Soffice,
- gid_File_Shellnew_Odp_Soffice,
- gid_File_Shellnew_Odt_Soffice);
+ gid_File_extras_newfiles);
End
Module gid_Module_Root_Files_3
commit 2f8d2c4ce4652e4e906eada7d248556db9bdc666
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 07:42:52 2013 +0200
install impress xml config files using filelists
Change-Id: I072d5283f979b42ffbd359575209c09cf445b6df
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 7753335..bff0354 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -63,16 +63,9 @@ End
// configuration files for custom animation effects
-File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml
+File gid_File_sd_xml
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
- Name = "effects.xml";
-End
-
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
- Name = "transitions.xml";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "sd_xml.filelist";
End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index f306dc8..29164ac 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -45,7 +45,8 @@ Module gid_Module_Prg_Impress_Bin
Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
gid_File_Lib_PresenterScreen,
gid_File_Share_Registry_Impress_Xcd,
- gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
+ gid_File_Lib_Animcore,
+ gid_File_sd_xml,
gid_File_Tmp_Userinstall_Impress_Inf);
End
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index ade2e74..3ae1bfd 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -41,9 +41,9 @@ STD_LIB_FILE(gid_File_Lib_OpenGLTransitions, OGLTrans)
File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
- Name = "transitions-ogl.xml";
+ Styles = (FILELIST,PACKED);
+ Dir = FILELIST_DIR;
+ Name = "sd_opengl.filelist";
End
File gid_File_Share_Registry_Ogltrans_Xcd
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 5b19b2c..64c6fe9 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Module_add_targets,sd,\
Library_sdd \
Library_sdfilt \
Library_sdui \
+ Package_opengl \
Package_web \
Package_xml \
UIConfig_sdraw \
diff --git a/sd/Package_opengl.mk b/sd/Package_opengl.mk
new file mode 100644
index 0000000..15a33da
--- /dev/null
+++ b/sd/Package_opengl.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,sd_opengl,$(SRCDIR)/sd/xml))
+
+$(eval $(call gb_Package_set_outdir,sd_opengl,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sd_opengl,share/config/soffice.cfg/simpress,\
+ transitions-ogl.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index b6a0e09..94e9607 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -9,8 +9,11 @@
$(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
-$(eval $(call gb_Package_add_file,sd_xml,xml/effects.xml,effects.xml))
-$(eval $(call gb_Package_add_file,sd_xml,xml/transitions-ogl.xml,transitions-ogl.xml))
-$(eval $(call gb_Package_add_file,sd_xml,xml/transitions.xml,transitions.xml))
+$(eval $(call gb_Package_set_outdir,sd_xml,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sd_xml,share/config/soffice.cfg/simpress,\
+ effects.xml \
+ transitions.xml \
+))
# vim: set noet sw=4 ts=4:
commit eb65a8d64862aa324846967034d55e3d2b72f2c5
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 4 07:30:45 2013 +0200
install openoffice 1.0 DTD files using filelist
Do we need to install them? Or even have them in the sources, FWIW? The
old XML format has been superceded by ODF 10 years ago...
Change-Id: I909afcf86ae808441c7dbc6182512bedb9789c1c
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6bca90f..759b677 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -326,13 +326,6 @@ File gid_File_Dtd_Module
Name = "module.dtd";
End
-File gid_File_Dtd_Office
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "office.dtd";
-End
-
File gid_File_Dtd_Statusbar
TXT_FILE_BODY;
Styles = (PACKED);
@@ -493,102 +486,11 @@ End
// mod files
-File gid_File_Mod_Chart
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "chart.mod";
-End
-
-File gid_File_Mod_Datastyl
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "datastyl.mod";
-End
-
-File gid_File_Mod_Defs
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "defs.mod";
-End
-
-File gid_File_Mod_Drawing
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "drawing.mod";
-End
-
-File gid_File_Mod_Dtypes
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "dtypes.mod";
-End
-
-File gid_File_Mod_Form
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "form.mod";
-End
-
-File gid_File_Mod_Meta
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "meta.mod";
-End
-
-File gid_File_Mod_Nmspace
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "nmspace.mod";
-End
-
-File gid_File_Mod_Office
+File gid_File_xmloff_dtd
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "office.mod";
-End
-
-File gid_File_Mod_Script
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "script.mod";
-End
-
-File gid_File_Mod_Settings
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "settings.mod";
-End
-
-File gid_File_Mod_Style
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "style.mod";
-End
-
-File gid_File_Mod_Table
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "table.mod";
-End
-
-File gid_File_Mod_Text
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Dtd_Ooo_1_0;
- Name = "text.mod";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "xmloff_dtd.filelist";
End
#if defined WITH_MOZAB4WIN
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4bc068c..5a429f8 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -419,23 +419,9 @@ Module gid_Module_Root_Files_6
gid_File_Dtd_Manifest,
gid_File_Dtd_Menubar,
gid_File_Dtd_Module,
- gid_File_Dtd_Office,
gid_File_Dtd_Statusbar,
gid_File_Dtd_Toolbar,
- gid_File_Mod_Chart,
- gid_File_Mod_Datastyl,
- gid_File_Mod_Defs,
- gid_File_Mod_Drawing,
- gid_File_Mod_Dtypes,
- gid_File_Mod_Form,
- gid_File_Mod_Meta,
- gid_File_Mod_Nmspace,
- gid_File_Mod_Office,
- gid_File_Mod_Script,
- gid_File_Mod_Settings,
- gid_File_Mod_Style,
- gid_File_Mod_Table,
- gid_File_Mod_Text,
+ gid_File_xmloff_dtd,
gid_File_officecfg_misc,
gid_File_Share_Glade_Xml,
gid_File_Share_Labels_Xml,
diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk
index 612e588..7375869 100644
--- a/xmloff/Package_dtd.mk
+++ b/xmloff/Package_dtd.mk
@@ -18,22 +18,25 @@
#
$(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/Blocklist.dtd,Blocklist.dtd))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/chart.mod,chart.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/datastyl.mod,datastyl.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/defs.mod,defs.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/drawing.mod,drawing.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/dtypes.mod,dtypes.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/form.mod,form.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/meta.mod,meta.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/nmspace.mod,nmspace.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.dtd,office.dtd))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/office.mod,office.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/openoffice-2.0-schema.rng,openoffice-2.0-schema.rng))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/script.mod,script.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/settings.mod,settings.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/style.mod,style.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/table.mod,table.mod))
-$(eval $(call gb_Package_add_file,xmloff_dtd,bin/text.mod,text.mod))
+
+$(eval $(call gb_Package_set_outdir,xmloff_dtd,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,xmloff_dtd,share/dtd/officedocument/1_0,\
+ chart.mod \
+ datastyl.mod \
+ defs.mod \
+ drawing.mod \
+ dtypes.mod \
+ form.mod \
+ meta.mod \
+ nmspace.mod \
+ office.dtd \
+ office.mod \
+ script.mod \
+ settings.mod \
+ style.mod \
+ table.mod \
+ text.mod \
+))
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list