summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2010-01-01 21:13:41 +0100
committerSebastian Pipping <sebastian@pipping.org>2010-01-01 21:13:41 +0100
commitbb08b7ef7849f39125bbc6756ac9e1a0405b8ac6 (patch)
treeebe1e82bff7ea8f212f58785413b45d45ce7bd97
parentFix usage of CVS header (diff)
downloadrepositories-xml-format-bb08b7ef7849f39125bbc6756ac9e1a0405b8ac6.tar.gz
repositories-xml-format-bb08b7ef7849f39125bbc6756ac9e1a0405b8ac6.tar.bz2
repositories-xml-format-bb08b7ef7849f39125bbc6756ac9e1a0405b8ac6.zip
Propagate "format", "subpath" and "category" from layman-global.txt to repositories.xml
-rw-r--r--schema/repositories.dtd15
-rw-r--r--schema/repositories.rng20
2 files changed, 31 insertions, 4 deletions
diff --git a/schema/repositories.dtd b/schema/repositories.dtd
index bde7a7b..662025f 100644
--- a/schema/repositories.dtd
+++ b/schema/repositories.dtd
@@ -13,7 +13,7 @@ http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git
Mounir Lamouri <volkmar@gentoo.org>
Tiziano Müller <dev-zero@gentoo.org>
- Copyright 1999-2009 Gentoo Foundation
+ Copyright 1999-2010 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
-->
<!ELEMENT repositories (repo)*>
@@ -21,7 +21,7 @@ http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git
xmlns CDATA #FIXED ''
version CDATA #FIXED '1.0'>
-<!ELEMENT repo (name,(description)+,(longdescription)*,(homepage)?,owner,(source)+,(feed)*)>
+<!ELEMENT repo (name,(description)+,(longdescription)*,(homepage)?,owner,(source)+,(subpath)?,(category)?,(feed)*)>
<!ATTLIST repo
xmlns CDATA #FIXED ''
priority CDATA #IMPLIED
@@ -54,7 +54,16 @@ http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git
<!ELEMENT source (#PCDATA)>
<!ATTLIST source
xmlns CDATA #FIXED ''
- type (bzr|cvs|darcs|git|mercurial|rsync|svn|tar) #REQUIRED>
+ type (bzr|cvs|darcs|git|mercurial|rsync|svn|tar) #REQUIRED
+ format (bz2|gz) #IMPLIED>
+
+<!ELEMENT subpath (#PCDATA)>
+<!ATTLIST subpath
+ xmlns CDATA #FIXED ''>
+
+<!ELEMENT category (#PCDATA)>
+<!ATTLIST category
+ xmlns CDATA #FIXED ''>
<!ELEMENT feed (#PCDATA)>
<!ATTLIST feed
diff --git a/schema/repositories.rng b/schema/repositories.rng
index 7051241..c554332 100644
--- a/schema/repositories.rng
+++ b/schema/repositories.rng
@@ -8,7 +8,7 @@
Mounir Lamouri <volkmar@gentoo.org>
Tiziano Müller <dev-zero@gentoo.org>
- Copyright 1999-2009 Gentoo Foundation
+ Copyright 1999-2010 Gentoo Foundation
Distributed under the terms of the GNU General Public License v2 or later
-->
<grammar ns="" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
@@ -99,9 +99,27 @@
<value>tar</value>
</choice>
</attribute>
+ <optional>
+ <attribute name="format">
+ <choice>
+ <value>bz2</value>
+ <value>gz</value>
+ </choice>
+ </attribute>
+ </optional>
<data type="anyURI"/>
</element>
</oneOrMore>
+ <optional>
+ <element name="subpath">
+ <text/>
+ </element>
+ </optional>
+ <optional>
+ <element name="category">
+ <text/>
+ </element>
+ </optional>
<zeroOrMore>
<element name="feed">
<data type="anyURI"/>