[gentoo-dev] [PATCH dtd] Remove outdated definition of global-scope <changelog/>

[gentoo-dev] [PATCH dtd] Remove outdated definition of global-scope <changelog/>

[Michał Górny]

Remove the long form of <changelog/> element that was likely used (or
supposed to be used) in the global metadata scope. It is currently
referenced in <upstream/> element only, and judging from the comments,
it is supposed to always be a URL there.
---
 metadata.dtd | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/metadata.dtd b/metadata.dtd
index 101478a..5bc8c39 100644
--- a/metadata.dtd
+++ b/metadata.dtd
@@ -30,29 +30,6 @@
     <!-- The meaning of sub-SLOTs for the whole package -->
     <!ELEMENT subslots (#PCDATA)* >
 
-  <!-- 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 -->
-  <!ELEMENT changelog (#PCDATA|change)* >
-    <!-- The changelog contains various "changes"-->
-    <!ELEMENT change (date,(developer|version|description|file|contributor|bug)*) >
-      <!ELEMENT date (#PCDATA) >
-        <!-- The date of the change, in "YYYY-MM-DD" format -->
-      <!ELEMENT developer (name?,email) >
-        <!-- The developer that made the change. The email is required, name
-	   is optional-->
-      <!ELEMENT version (#PCDATA) >
-        <!--version of the packages involved (one tag per version)-->
-      <!ELEMENT file (#PCDATA) ><!-- one tag per file touched -->
-      <!ELEMENT contributor (name?,email?) >
-        <!-- 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 -->
-      <!ELEMENT bug (#PCDATA) >
-        <!-- 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 -->
   <!ELEMENT use (flag)* >
     <!ELEMENT flag (#PCDATA|pkg|cat)* >
@@ -66,6 +43,8 @@
       the usage of the status attribute is nevertheless _only_ allowed
       in the upstream maintainer element. -->
     <!ATTLIST maintainer status (active|inactive|unknown) "unknown" >
+    <!-- URL where the upstream changelog can be found -->
+    <!ELEMENT changelog (#PCDATA)>
     <!-- URL where the location of the upstream documentation can be found -->
     <!ELEMENT doc (#PCDATA)>
       <!ATTLIST doc lang CDATA "C" >
-- 
2.7.2

[gentoo-dev] Re: [PATCH dtd] Remove outdated definition of global-scope <changelog/>

[Dirkjan Ochtman]

On Wed, Mar 2, 2016 at 12:38 PM, Michał Górny <mgorny@gentoo.org> wrote:
> Remove the long form of <changelog/> element that was likely used (or
> supposed to be used) in the global metadata scope. It is currently
> referenced in <upstream/> element only, and judging from the comments,
> it is supposed to always be a URL there.

LGTM!

[gentoo-dev] Re: [PATCH dtd] Remove outdated definition of global-scope <changelog/>

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

>>>>> On Wed, 2 Mar 2016, Michał Górny wrote:

> Remove the long form of <changelog/> element that was likely used (or
> supposed to be used) in the global metadata scope. It is currently
> referenced in <upstream/> element only, and judging from the comments,
> it is supposed to always be a URL there.

Apparently the original plan for metadata.xml was to convert
ChangeLogs to XML and include them as part of the file:
http://thread.gmane.org/gmane.linux.gentoo.devel/9663

So yes, kill it with fire. Patch LGTM.

Ulrich

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]