Correct some policy inconsistencies; require core docs and licences

diff --git a/ChangeLog b/ChangeLog
index ef13b85..6bf014b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-27  Charles Wilson  <mingw@cwilson.fastmail.fm>
+
+       * msys/msys-core.xml (msys-core-bin): Require -lic and -doc cpts.
+       * msys/msys-gettext.xml: Reduce to deliver only latest version of all
+       package components; make all versioned -dll refs release specific.
+       * msys/msys-regex.xml msys/msys-termcap.xml: Make all versioned -dll
+       refs release specific.
+
 2010-07-26  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Add grep, sed, awk and extended msys-core to msys-base.

diff --git a/msys/msys-core.xml b/msys/msys-core.xml
index 62581c9..e34a63a 100644 (file)
--- a/msys/msys-core.xml
+++ b/msys/msys-core.xml
@@ -37,8 +37,12 @@
       <component class="bin">
         <!-- Note: no specific dll component in this package; the
          MSYS dll, which is required by all MSYS packages, is bundled
-         within this msys-core-bin component.
+         within this msys-core-bin component.  Always ensure that the
+         basic MSYS documentation and licence information is installed
+         along with msys-core-bin; only msys-core is treated this way.
          -->
+        <requires eq="msys-core-%-msys-%-doc.tar" />
+        <requires eq="msys-core-%-msys-%-lic.tar" />
         <release tarname="msysCORE-1.0.15-1-msys-1.0.15-bin.tar.lzma" />
       </component>
 

diff --git a/msys/msys-gettext.xml b/msys/msys-gettext.xml
index 23fa6ba..1d296f7 100644 (file)
--- a/msys/msys-gettext.xml
+++ b/msys/msys-gettext.xml
@@ -8,7 +8,7 @@
 
     <package name="msys-gettext">
       <affiliate group="MSYS System Builder" />
-      <description lang="en" title="gettext (msys): GNU Internationalization Library and Utilities" >
+      <description lang="en" title="gettext (msys): GNU Internationalization Library and Utilities">
         <paragraph>This is not the gettext you are looking for.</paragraph>
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual
@@ -47,26 +47,22 @@
       <licence tarname="gettext-%-msys-%-lic.tar" />
 
       <component class="bin">
-        <release tarname="gettext-0.17-1-msys-1.0.11-bin.tar.lzma" />
-        <release tarname="gettext-0.17-2-msys-1.0.13-bin.tar.lzma" >
+        <release tarname="gettext-0.17-2-msys-1.0.13-bin.tar.lzma">
           <requires eq="msys-libintl-%-msys-%-dll-8.tar" />
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
         </release>
       </component>
 
       <component class="doc">
-        <release tarname="gettext-0.17-1-msys-1.0.11-doc.tar.lzma" />
         <release tarname="gettext-0.17-2-msys-1.0.13-doc.tar.lzma" />
       </component>
 
       <component class="lic">
-        <release tarname="gettext-0.17-1-msys-1.0.11-lic.tar.lzma" />
         <release tarname="gettext-0.17-2-msys-1.0.13-lic.tar.lzma" />
       </component>
 
       <component class="dev">
-        <release tarname="gettext-0.17-1-msys-1.0.11-dev.tar.lzma" />
-        <release tarname="gettext-0.17-2-msys-1.0.13-dev.tar.lzma" >
+        <release tarname="gettext-0.17-2-msys-1.0.13-dev.tar.lzma">
           <requires eq="msys-libgettextpo-%-msys-%-dll-0.tar" />
           <requires eq="msys-libintl-%-msys-%-dll-8.tar" />
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
@@ -76,14 +72,13 @@
       </component>
 
       <component class="ext">
-        <release tarname="gettext-0.17-1-msys-1.0.11-ext.tar.lzma" />
         <release tarname="gettext-0.17-2-msys-1.0.13-ext.tar.lzma" />
       </component>
     </package>
 
     <package name="msys-libintl">
       <affiliate group="MSYS System Builder" />
-      <description lang="en" title="libintl (msys): GNU Internationalization Runtime Library" >
+      <description lang="en" title="libintl (msys): GNU Internationalization Runtime Library">
         <paragraph>This is not the libintl you are looking for.</paragraph>
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual
@@ -123,15 +118,16 @@
       <licence tarname="gettext-%-msys-%-lic.tar" />
 
       <component class="dll">
-        <release tarname="libintl-0.17-2-msys-dll-8.tar.lzma" />
+        <release tarname="libintl-0.17-2-msys-dll-8.tar.lzma">
+          <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
+        </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
-        <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
       </component>
     </package>
 
     <package name="msys-libgettextpo">
       <affiliate group="MSYS System Builder" />
-      <description lang="en" title="libgettextpo (msys): GNU Internationalization Utility Library" >
+      <description lang="en" title="libgettextpo (msys): GNU Internationalization Utility Library">
         <paragraph>This is not the libgettextpo you are looking for.</paragraph>
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual
@@ -173,17 +169,18 @@
       <licence tarname="gettext-%-msys-%-lic.tar" />
 
       <component class="dll">
-        <release tarname="libgettextpo-0.17-2-msys-dll-0.tar.lzma" />
+        <release tarname="libgettextpo-0.17-2-msys-dll-0.tar.lzma">
+          <requires eq="msys-libintl-%-msys-%-dll-8.tar" />
+          <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
+          <requires eq="msys-libtermcap-*-msys-*-dll-0.tar.lzma" />
+        </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
-        <requires eq="msys-libintl-%-msys-%-dll-8.tar" />
-        <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
-        <requires eq="msys-libtermcap-*-msys-*-dll-0.tar.lzma" />
       </component>
     </package>
 
     <package name="msys-libasprintf">
       <affiliate group="MSYS System Builder" />
-      <description lang="en" title="libasprintf (msys): GNU Internationalization Utility Library" >
+      <description lang="en" title="libasprintf (msys): GNU Internationalization Utility Library">
         <paragraph>This is not the libasprintf you are looking for.</paragraph>
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual

diff --git a/msys/msys-regex.xml b/msys/msys-regex.xml
index 06ae049..1fa1e2b 100644 (file)
--- a/msys/msys-regex.xml
+++ b/msys/msys-regex.xml
@@ -57,8 +57,9 @@
       </component>
 
       <component class="dev">
-        <release tarname="libregex-1.20090805-2-msys-1.0.13-dev.tar.lzma" />
-        <requires eq="msys-libregex-%-msys-%-dll-1.tar" />
+        <release tarname="libregex-1.20090805-2-msys-1.0.13-dev.tar.lzma">
+          <requires eq="msys-libregex-%-msys-%-dll-1.tar" />
+        </release>
       </component>
     </package>
 

diff --git a/msys/msys-termcap.xml b/msys/msys-termcap.xml
index 0c8dc0c..c152338 100644 (file)
--- a/msys/msys-termcap.xml
+++ b/msys/msys-termcap.xml
@@ -67,9 +67,9 @@
       </component>
 
       <component class="dev">
-        <release tarname="libtermcap-0.20050421_1-2-msys-1.0.13-dev.tar.lzma" />
-        <requires eq="msys-libtermcap-%-msys-%-dll-0.tar" />
-        <requires eq="msys-termcap-%-msys-%-bin.tar" />
+        <release tarname="libtermcap-0.20050421_1-2-msys-1.0.13-dev.tar.lzma">
+          <requires eq="msys-libtermcap-%-msys-%-dll-0.tar" />
+        </release>
       </component>
     </package>