Update rnc schemas.nxml-gentoo-schemas-20090527

1 files changed, 38 insertions, 5 deletions

diff --git a/metadata.rnc b/metadata.rnc
index 429dd05..4fb8abd 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -10,7 +10,8 @@ attlist.catmetadata &=
 # Metadata for a package
 pkgmetadata =
   element pkgmetadata {
-    attlist.pkgmetadata, (herd | maintainer | longdescription | use)*
+    attlist.pkgmetadata,
+    (herd | maintainer | longdescription | use | upstream)*
   }
 attlist.pkgmetadata &=
   [ a:defaultValue = "" ] attribute pkgname { text }?
@@ -23,9 +24,14 @@ maintainer =
   }
 #  A long description of the package in freetext
 longdescription =
-  element longdescription { attlist.longdescription, (text | pkg)* }
+  element longdescription {
+    attlist.longdescription, (text | pkg | cat)*
+  }
 #  The changelog of the package
-changelog = element changelog { attlist.changelog, change* }
+
+# Please note that #PCDATA is mentioned only for the upstream changelog
+# element, where the content is a URL. This is due to limitations of the DTD
+changelog = element changelog { attlist.changelog, (text | change)* }
 attlist.changelog &= empty
 #  The changelog contains various "changes"
 change =
@@ -61,13 +67,40 @@ attlist.bug &= empty
 
 # description of what this USE flag does for this package
 use = element use { attlist.use, flag* }
-flag = element flag { attlist.flag, (text | pkg)* }
+flag = element flag { attlist.flag, (text | pkg | cat)* }
 # name attribute holds the name of the USE flag
 attlist.flag &= attribute name { text }
+# upstream metadata information (maintainers, upstream docs,..)
+upstream =
+  element upstream {
+    attlist.upstream,
+    (maintainer | changelog | doc | bugs-to | remote-id)*
+  }
+attlist.upstream &= empty
+# Due to the limitation of DTD this will also allow a status
+# attribute for the package maintainer element. Please note that
+# the usage of the status attribute is nevertheless _only_ allowed
+# in the upstream maintainer element.
+attlist.maintainer &=
+  [ a:defaultValue = "unknown" ]
+  attribute status { "active" | "inactive" | "unknown" }?
+# URL where the location of the upstream documentation can be found
+doc = element doc { attlist.doc, text }
+attlist.doc &= [ a:defaultValue = "C" ] attribute lang { text }?
+# location where to report bugs
+# (may also be an email address prefixed with mailto:)
+bugs-to = element bugs-to { attlist.bugs-to, text }
+attlist.bugs-to &= empty
+# specify a type of package identification tracker
+remote-id = element remote-id { attlist.remote-id, text }
+attlist.remote-id &=
+  attribute type { "freshmeat" | "sourceforge" | "cpan" | "vim" }
 # category/package information for cross-linking in descriptions
 # and useflag descriptions
 pkg = element pkg { attlist.pkg, text }
 attlist.pkg &= empty
+cat = element cat { attlist.cat, text }
+attlist.cat &= empty
 # Common attributes
 
 # the lang attribute, specifies the language of this tag. This is 
@@ -98,5 +131,5 @@ name = element name { attlist.name, text }
 attlist.name &= empty
 #  the name of a person (maintainer, contributor)
 description = element description { attlist.description, text }
-start = catmetadata | packages | changelog
+start = catmetadata | packages
 #  A description of a maintainer or change