From 134ad07b81b30c833a53f299313a7659f95e2b01 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Sat, 12 Mar 2016 13:27:57 +0100
Subject: Update rnc schemas.

---
 metadata.rnc | 55 ++++++++++---------------------------------------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/metadata.rnc b/metadata.rnc
index b7944d9..2ed65b0 100644
--- a/metadata.rnc
+++ b/metadata.rnc
@@ -1,8 +1,7 @@
+# Metadata for a category
+
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 
-packages = element packages { attlist.packages, pkgmetadata* }
-attlist.packages &= empty
-# Metadata for a category
 catmetadata =
   element catmetadata { attlist.catmetadata, longdescription* }
 attlist.catmetadata &=
@@ -48,44 +47,6 @@ attlist.slot &= attribute name { text }
 # The meaning of sub-SLOTs for the whole package
 subslots = element subslots { attlist.subslots, text* }
 attlist.subslots &= empty
-#  The changelog of the package
-
-# 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 =
-  element change {
-    attlist.change,
-    date,
-    (developer | version | description | file | contributor | bug)*
-  }
-attlist.change &= empty
-date = element date { attlist.date, text }
-attlist.date &= empty
-# The date of the change, in "YYYY-MM-DD" format
-developer = element developer { attlist.developer, name?, email }
-attlist.developer &= empty
-#  The developer that made the change. The email is required, name
-# is optional
-version = element version { attlist.version, text }
-attlist.version &= empty
-# version of the packages involved (one tag per version)
-file = element file { attlist.file, text }
-attlist.file &= empty
-# one tag per file touched
-contributor = element contributor { attlist.contributor, name?, email? }
-attlist.contributor &= empty
-# A reference to a user that helped in causing this change. 
-# There should at least be a name or email address included. 
-# Email is preferred
-bug = element bug { attlist.bug, text }
-attlist.bug &= empty
-# bug-id of a bug fixed by this change, multiple allowed. The 
-# format of this is a number or alias for a bug. NOT including a 
-# # character
-
 # description of what this USE flag does for this package
 use = element use { attlist.use, flag* }
 flag = element flag { attlist.flag, (text | pkg | cat)* }
@@ -105,6 +66,9 @@ attlist.upstream &= empty
 attlist.maintainer &=
   [ a:defaultValue = "unknown" ]
   attribute status { "active" | "inactive" | "unknown" }?
+# URL where the upstream changelog can be found
+changelog = element changelog { attlist.changelog, text }
+attlist.changelog &= empty
 # 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 }?
@@ -167,12 +131,13 @@ attlist.maintainer &= attribute restrict { text }?
 attlist.longdescription &= attribute restrict { text }?
 attlist.flag &= attribute restrict { text }?
 # standard parts
+
+# an email address
 email = element email { attlist.email, text }
 attlist.email &= empty
-# an email address
+# the name of a person (maintainer, contributor)
 name = element name { attlist.name, text }
 attlist.name &= empty
-#  the name of a person (maintainer, contributor)
+# A description of a maintainer or change
 description = element description { attlist.description, text }
-#  A description of a maintainer or change
-start = catmetadata | pkgmetadata
+start = pkgmetadata | catmetadata
-- 
cgit v1.2.3-65-gdbad