Add mingwrt-4.0.0-1 and w32api-4.0.0-1

diff --git a/ChangeLog b/ChangeLog
index 29794ac..9e18aa1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-23  Earnie Boyd  <earnie@users.sourceforge.net>
+
+       * mingw32/mingw32-runtime.xml: Add mingwrt-4.0.0-1 and w32api-4.0.0-1.
+       Modify the default source type to -bld and the licence type to -lic.
+       Add source and licence elements to the previous packages to represent
+       the previous licence and source files.
+       * common/issue.log mingw32/issue.log: Update accordingly.
+
 2013-07-23  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Correct some "Basic Setup" package group affiliations.

diff --git a/common/issue.log b/common/issue.log
index d8ebb80..e10fc5b 100644 (file)
--- a/common/issue.log
+++ b/common/issue.log
@@ -23,6 +23,6 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
-  75fc52dde8d408d798c0be51070d5d02f4c63085 2013072300 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2013082303 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index d29cd9e..aec67d7 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -50,11 +50,11 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   d31c39c6584fde6d4b9ddafbca913509b32a1dfc 2012073100 mingw32-mpc.xml
   99995a8e17659b6514f71ae2b17bbbcd8eb4c0a9 2012073100 mingw32-mpfr.xml
-  983af8ad24a6f97da867784dfeeecc6661d54d88 2013072200 mingw32-package-list.xml
+  983af8ad24a6f97da867784dfeeecc6661d54d88 2013082303 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   9399cb6c2efd8fd907c42a278a6f41bbde9e440c 2011091400 mingw32-pthreads-w32.xml
-  428964289b3509293a13c9394199b5e2d4887c3e 2012063001 mingw32-runtime.xml
+  c5e5acd7ddfbb8b412ba1ade45088d7a22433228 2013082303 mingw32-runtime.xml
   12acb32f80e49c893167cfae82e448dd766d49bb 2013070100 mingw32-wsl-candidate.xml
   247a02890f109a5fe4996fde4af9d576dca3cd1e 2012073100 mingw32-xz.xml
   4a2e1515655331483b8ddc898b2405fb89401d73 2012073100 mingw32-zlib.xml

diff --git a/mingw32/mingw32-runtime.xml b/mingw32/mingw32-runtime.xml
index 59a92d3..3430dcd 100644 (file)
--- a/mingw32/mingw32-runtime.xml
+++ b/mingw32/mingw32-runtime.xml
@@ -24,24 +24,68 @@
         </paragraph>
       </description>
 
-      <source tarname="mingwrt-%-mingw32-src.tar.%" />
-      <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+      <source tarname="mingwrt-%-mingw32-bld.tar.%" />
+      <licence tarname="mingwrt-%-mingw32-lic.tar.%" />
 
       <component class="dev">
-        <requires eq="mingwrt-%-mingw32-dll.tar" />
-        <release tarname="mingwrt-3.20-2-mingw32-dev.tar.lzma" />
-        <release tarname="mingwrt-3.20-mingw32-dev.tar.gz" />
-        <release tarname="mingwrt-3.19-mingw32-dev.tar.gz" />
-        <release tarname="mingwrt-3.18-mingw32-dev.tar.gz" />
-        <release tarname="mingwrt-3.17-mingw32-dev.tar.gz" />
+        <requires eq="mingwrt-%-mingw32-dll.tar.%" />
+       <release tarname="mingwrt-4.0.0-1-mingw32-dev.tar.lzma" />
+       <!-- The default source and licence name changed so we must -->
+       <!-- specify the original. -->
+        <release tarname="mingwrt-3.20-2-mingw32-dev.tar.lzma" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.20-mingw32-dev.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.19-mingw32-dev.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.18-mingw32-dev.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.17-mingw32-dev.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
       </component>
 
       <component class="dll">
-        <release tarname="mingwrt-3.20-2-mingw32-dll.tar.lzma" />
-        <release tarname="mingwrt-3.20-mingw32-dll.tar.gz" />
-        <release tarname="mingwrt-3.19-mingw32-dll.tar.gz" />
-        <release tarname="mingwrt-3.18-mingw32-dll.tar.gz" />
-        <release tarname="mingwrt-3.17-mingw32-dll.tar.gz" />
+       <release tarname="mingwrt-4.0.0-1-mingw32-dll.tar.lzma" />
+       <!-- The default source and licence name changed so we must -->
+       <!-- specify the original. -->
+        <release tarname="mingwrt-3.20-2-mingw32-dll.tar.lzma" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.20-mingw32-dll.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.19-mingw32-dll.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.18-mingw32-dll.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="mingwrt-3.17-mingw32-dll.tar.gz" >
+         <source tarname="mingwrt-%-mingw32-src.tar.%" />
+         <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
+       </release>
+      </component>
+
+      <component class="lic">
+       <release tarname="mingwrt-4.0.0-1-mingw32-lic.tar.lzma" />
+      </component>
+
+      <component class="doc">
+       <release tarname="mingwrt-4.0.0-1-mingw32-doc.tar.lzma" />
       </component>
     </package>
 
@@ -60,15 +104,43 @@
         </paragraph>
       </description>
 
-      <source tarname="w32api-%-mingw32-src.tar.%" />
-      <licence tarname="w32api-%-mingw32-dev.tar.%" />
+      <source tarname="w32api-%-mingw32-bld.tar.%" />
+      <licence tarname="w32api-%-mingw32-lic.tar.%" />
 
       <component class="dev">
-        <release tarname="w32api-3.17-2-mingw32-dev.tar.lzma" />
-        <release tarname="w32api-3.17-1-mingw32-dev.tar.lzma" />
-        <release tarname="w32api-3.16-1-mingw32-dev.tar.lzma" />
-        <release tarname="w32api-3.15-1-mingw32-dev.tar.lzma" />
-        <release tarname="w32api-3.14-mingw32-dev.tar.gz" />
+       <release tarname="w32api-4.0.0-1-mingw32-dev.tar.lzma" >
+         <requires eq="mingwrt-4.0.0-1-mingw32-dev.tar.lzma" />
+       </release>
+       <!-- The default source and licence name changed so we must -->
+       <!-- specify the original. -->
+        <release tarname="w32api-3.17-2-mingw32-dev.tar.lzma" >
+         <source tarname="w32api-%-mingw32-src.tar.%" />
+         <licence tarname="w32api-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="w32api-3.17-1-mingw32-dev.tar.lzma" >
+         <source tarname="w32api-%-mingw32-src.tar.%" />
+         <licence tarname="w32api-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="w32api-3.16-1-mingw32-dev.tar.lzma" >
+         <source tarname="w32api-%-mingw32-src.tar.%" />
+         <licence tarname="w32api-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="w32api-3.15-1-mingw32-dev.tar.lzma" >
+         <source tarname="w32api-%-mingw32-src.tar.%" />
+         <licence tarname="w32api-%-mingw32-dev.tar.%" />
+       </release>
+        <release tarname="w32api-3.14-mingw32-dev.tar.gz" >
+         <source tarname="w32api-%-mingw32-src.tar.%" />
+         <licence tarname="w32api-%-mingw32-dev.tar.%" />
+       </release>
+      </component>
+
+      <component class="lic">
+       <release tarname="w32api-4.0.0-1-mingw32-lic.tar.lzma" />
+      </component>
+
+      <component class="doc">
+       <release tarname="w32api-4.0.0-1-mingw32-doc.tar.lzma" />
       </component>
     </package>