* bring DTD up to date

diff --git a/pear/package.dtd b/pear/package.dtd
index a57dc5855ea97f8695838935ad02edfb781824d3..4818c4e598344e6ee30ca3c37daa0df15d893117 100644 (file)
--- a/pear/package.dtd
+++ b/pear/package.dtd
@@ -1,10 +1,10 @@
 <!--
-     $Id: package.dtd,v 1.12 2001-12-28 02:09:27 ssb Exp $
+     $Id: package.dtd,v 1.13 2002-01-30 09:23:34 ssb Exp $
 
-     This is the PEAR package description, version 1.1b1.
+     This is the PEAR package description, version 1.1b2.
      It should be used with the informal public identifier:
 
-         "-//PHP Group//DTD PEAR Package 1.1b1//EN//XML"
+         "-//PHP Group//DTD PEAR Package 1.1b2//EN//XML"
 
      Copyright (c) 1997-2002 The PHP Group             
 
@@ -20,116 +20,59 @@
          Stig S. Bakken <ssb@fast.no>
 
   -->
-<!--============== attributes present in all elements ======================-->
-<!ENTITY % global.atts "id             ID      #IMPLIED">
-<!--============== attributes common to several elements ===================-->
-<!ENTITY % role.atts "role             (php|ext|test|doc) 'php'">
-<!ENTITY % extension.atts "debug       (on|off) 'off'
-                          threadsafe   (on|off) 'off'">
-<!ENTITY % format.atts "format         CDATA   #IMPLIED">
-<!--=============== ELEMENT: package =======================================-->
-<!ELEMENT package (name, summary, description, maintainer, release)>
-<!ATTLIST package
-       %global.atts; 
-       type (source | binary | empty) "empty"
->
-<!--=============== ELEMENT: name ==========================================-->
+
+<!ELEMENT package (name|summary|description|maintainers|release)*>
+<!ATTLIST package type    (source|binary|empty) "empty"
+                  version CDATA                 #REQUIRED>
+
 <!ELEMENT name (#PCDATA)>
-<!ATTLIST name
-       %global.atts; 
->
-<!--=============== ELEMENT: summary =======================================-->
+
 <!ELEMENT summary (#PCDATA)>
-<!ATTLIST summary
-       %global.atts; 
->
-<!--=============== ELEMENT: description ===================================-->
+
 <!ELEMENT description (#PCDATA)>
-<!ATTLIST description
-       %global.atts; 
->
-<!--=============== ELEMENT: maintainer ====================================-->
-<!ELEMENT maintainer (user, name, email)>
-<!ATTLIST maintainer
-       %global.atts; 
->
-<!--=============== ELEMENT: user ==========================================-->
+
+<!ELEMENT maintainers (maintainer)*>
+
+<!ELEMENT maintainer (user|role|name|email)*>
+
 <!ELEMENT user (#PCDATA)>
-<!ATTLIST user
-       %global.atts; 
->
-<!--=============== ELEMENT: email =========================================-->
+
+<!ELEMENT role (#PCDATA)>
+
 <!ELEMENT email (#PCDATA)>
-<!ATTLIST email
-       %global.atts; 
->
-<!--=============== ELEMENT: release =======================================-->
-<!ELEMENT release (version?, state?, date, notes?, filelist)>
-<!ATTLIST release
-       %global.atts; 
->
-<!--=============== ELEMENT: version =======================================-->
+
+<!ELEMENT release (version|state|date|notes|filelist|deps)*>
+
 <!ELEMENT version (#PCDATA)>
-<!ATTLIST version
-       %global.atts; 
->
-<!--=============== ELEMENT: state =========================================-->
+
 <!ELEMENT state (#PCDATA)>
-<!ATTLIST state
-       %global.atts; 
->
-<!--=============== ELEMENT: date =========================================-->
+
 <!ELEMENT date (#PCDATA)>
-<!ATTLIST date
-       %global.atts; 
->
-<!--=============== ELEMENT: notes =========================================-->
+
 <!ELEMENT notes (#PCDATA)>
-<!ATTLIST notes
-       %global.atts; 
->
-<!--=============== ELEMENT: filelist ======================================-->
-<!ELEMENT filelist (dir | file | libfile)*>
-<!ATTLIST filelist
-       %global.atts; 
->
-<!--=============== ELEMENT: dir ===========================================-->
-<!ELEMENT dir (#PCDATA)>
-<!ATTLIST dir
-       %global.atts; 
->
-<!--=============== ELEMENT: file ==========================================-->
+
+<!ELEMENT filelist (dir|file|libfile)*>
+
+<!ELEMENT dir (file|libfile)*>
+
 <!ELEMENT file (#PCDATA)>
-<!ATTLIST file
-       %global.atts; 
-       %role.atts; 
-       %extension.atts; 
-       %format.atts; 
->
-<!--=============== ELEMENT: libfile =======================================-->
-<!ELEMENT libfile (libname,sources,includes?,libadd?)>
-<!ATTLIST libfile
-       %global.atts; 
-       %role.atts; 
->
-<!--=============== ELEMENT: libfile =======================================-->
-<!ELEMENT libfile (libname,sources,includes?,libadd?)>
-<!ATTLIST libfile
-       %global.atts; 
-       %role.atts; 
->
-<!--=============== ELEMENT: libname =======================================-->
+<!ATTLIST file role     (php|ext|test|doc) 'php'
+               debug    (na|on|off)        'na'
+               threaded (na|on|off)        'na'
+               format   CDATA              #IMPLIED>
+
+<!ELEMENT libfile (libname|sources|includes|libadd)*>
+
 <!ELEMENT libname (#PCDATA)>
-<!ATTLIST libname
-       %global.atts; 
->
-<!--=============== ELEMENT: sources =======================================-->
+
 <!ELEMENT sources (#PCDATA)>
-<!ATTLIST sources
-       %global.atts; 
->
-<!--=============== ELEMENT: libadd ========================================-->
+
 <!ELEMENT libadd (#PCDATA)>
-<!ATTLIST libadd
-       %global.atts; 
->
+
+<!ELEMENT deps (dep)*>
+
+<!ELEMENT dep (#PCDATA)>
+<!ATTLIST dep
+       type    (pkg|ext|php|prog|ldlib|ltlib|os|websrv|sapi) #REQUIRED
+       rel     (has|eq|lt|le|gt|ge)                          #IMPLIED
+       version CDATA                                         #IMPLIED>