Withdraw regressive WSL-4.x from general distribution.

diff --git a/ChangeLog b/ChangeLog
index 3a542ef..26c34dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,24 @@
+2014-08-26  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Withdraw regressive WSL-4.x from general distribution.
+
+       * mingw32/mingw32-runtime.xml: Revert to last issue predating WSL-4.x
+       * mingw32/mingw32-gcc4.xml: Clean up malformed dependency references.
+       (mingwrt, w32api): Replace all dependencies on WSL-4.x releases with
+       generic references to the most recently available releases of previous
+       mingwrt-3.x and w32api-3.x packages respectively.
+
+       * common/package-list.xml common/issue.log: Update accordingly.
+       * mingw32/mingw32-package-list.xml mingw32/issue.log: Likewise.
+
 2014-08-25  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Revert corruption of file attributes (again).
 
        * common/issue.log mingw32/issue.log msys/issue.log: Remove bogus
-       executable attribute.
+       executable attribute; this also necessitates republication of...
+       * common/package-list.xml mingw32/mingw32-package-list.xml:
+       * msys/msys-package-list.xml: ...all of these.
 
 2014-08-05  Erwin Waterlander  <waterlan@xs4all.nl>
 

diff --git a/common/issue.log b/common/issue.log
index 4cb3ee2..633d170 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 2014080500 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2014082601 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index a7c7e37..4cf3dc5 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -35,7 +35,7 @@
   4dab2d86ca2203a8ac0233824c687504fda4601e 2013091000 mingw32-expat.xml
   bc4b331f9bdfbf72a11a310fbc17a027396d09d5 2012073100 mingw32-gcc-tools.xml
   9d1d9deeccee4fb04f2944e3cd5e7b85757308ce 2011050500 mingw32-gcc3.xml
-  b69474c41dc6c8fd0a9d61a50604e2cfdcf1dff2 2013101500 mingw32-gcc4.xml
+  db58df47f1a7040488cac4bd0fc6dfab758035e7 2014082600 mingw32-gcc4.xml
   21031079d59268339bfd7c6dc8239df214588bca 2013091501 mingw32-gdb.xml
   14dd10ab97b27430bdb688f4e85993cd821f7a05 2012073100 mingw32-gendef.xml
   1f3543e9db268270f03ee13db26e558be896a45c 2014043000 mingw32-gettext.xml
@@ -50,11 +50,11 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   3b9dfae51f73761e69811f402c6374c63aeec552 2013110100 mingw32-mpc.xml
   8a11de23e7a89fd11436bdf162ef90712f30101b 2013102300 mingw32-mpfr.xml
-  1413ad59660ad963082e7de10c31bbb725116aee 2014080500 mingw32-package-list.xml
+  1413ad59660ad963082e7de10c31bbb725116aee 2014082600 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   0a5d210a13d073104fb74b4f9c081674c9745cd1 2013090900 mingw32-pthreads-w32.xml
-  9c25488c3b98582e1204e6120eac7b94ed3d955d 2013092200 mingw32-runtime.xml
+  428964289b3509293a13c9394199b5e2d4887c3e 2014082600 mingw32-runtime.xml
   12acb32f80e49c893167cfae82e448dd766d49bb 2013070100 mingw32-wsl-candidate.xml
   247a02890f109a5fe4996fde4af9d576dca3cd1e 2012073100 mingw32-xz.xml
   c223ecd7389eb02948b54f8959d595cf608306a7 2013101200 mingw32-zlib.xml

diff --git a/mingw32/mingw32-gcc4.xml b/mingw32/mingw32-gcc4.xml
index bb92d3a..edda012 100644 (file)
--- a/mingw32/mingw32-gcc4.xml
+++ b/mingw32/mingw32-gcc4.xml
@@ -37,105 +37,71 @@
       </component>
 
       <component class="bin">
+        <requires eq="binutils-*-mingw32-bin.tar" />
+        <requires eq="mingwrt-*-mingw32-dev.tar" />
+        <requires eq="w32api-*-mingw32-dev.tar" />
         <release tarname="gcc-core-4.8.1-4-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-4.8.1-4-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-core-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.8.1-3-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-4.8.1-3-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-core-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.8.1-2-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-core-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.8.1-1-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-core-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.7.2-1-mingw32-bin.tar.lzma">
           <requires eq="libquadmath-%-mingw32-dll-0.tar" />
           <requires eq="libssp-%-mingw32-dll-0.tar" />
           <requires eq="libgomp-%-mingw32-dll-1.tar" />
           <requires eq="libgcc-%-mingw32-dll-1.tar" />
-          <requires ge="mingwrt-3.20-2-mingw32-dev.tar" />
           <requires eq="libmpc-*-mingw32-dll-2.tar" />
           <requires eq="pthreads-w32-*-mingw32-dev.tar" />
-          <requires eq="binutils-*-mingw32-bin.tar" />
-          <requires eq="w32api-*-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.7.0-1-mingw32-bin.tar.lzma">
           <requires eq="libquadmath-%-mingw32-dll-0.tar" />
-          <requires ge="mingwrt-3.20-2-mingw32-dev.tar" />
           <requires eq="libssp-%-mingw32-dll-0.tar" />
           <requires eq="libgomp-%-mingw32-dll-1.tar" />
           <requires eq="libgcc-%-mingw32-dll-1.tar" />
           <requires eq="libmpc-*-mingw32-dll-2.tar" />
           <requires eq="pthreads-w32-*-mingw32-dev.tar" />
-          <requires eq="binutils-*-mingw32-bin.tar" />
-          <requires eq="w32api-*-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.6.2-1-mingw32-bin.tar.lzma">
           <requires eq="libquadmath-%-mingw32-dll-0.tar" />
-          <requires lt="mingwrt-3.20-2-mingw32-dev.tar" />
           <requires eq="libssp-%-mingw32-dll-0.tar" />
           <requires eq="libgomp-%-mingw32-dll-1.tar" />
           <requires eq="libgcc-%-mingw32-dll-1.tar" />
           <requires eq="libmpc-*-mingw32-dll-2.tar" />
           <requires eq="pthreads-w32-*-mingw32-dev.tar" />
-          <requires eq="binutils-*-mingw32-bin.tar" />
-          <requires eq="w32api-*-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.6.1-2-mingw32-bin.tar.lzma">
           <requires eq="libquadmath-%-mingw32-dll-0.tar" />
-          <requires lt="mingwrt-3.20-2-mingw32-dev.tar" />
           <requires eq="libssp-%-mingw32-dll-0.tar" />
           <requires eq="libgomp-%-mingw32-dll-1.tar" />
           <requires eq="libgcc-%-mingw32-dll-1.tar" />
           <requires eq="libmpc-*-mingw32-dll-2.tar" />
           <requires eq="pthreads-w32-*-mingw32-dev.tar" />
-          <requires eq="binutils-*-mingw32-bin.tar" />
-          <requires eq="w32api-*-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-core-4.5.2-1-mingw32-bin.tar.lzma">
-          <requires lt="mingwrt-3.20-2-mingw32-dev.tar" />
           <requires eq="libssp-%-mingw32-dll-0.tar" />
           <requires eq="libgomp-%-mingw32-dll-1.tar" />
           <requires eq="libgcc-%-mingw32-dll-1.tar" />
           <requires eq="libmpc-*-mingw32-dll-2.tar" />
           <requires eq="pthreads-w32-*-mingw32-dev.tar" />
-          <requires eq="binutils-*-mingw32-bin.tar" />
-          <requires eq="w32api-*-mingw32-dev.tar" />
         </release>
       </component>
 
       <component class="dev">
-        <release tarname="gcc-core-4.8.1-4-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgcc-4.8.1-4-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libssp-4.8.1-4-mingw32-dll-0.tar" />
-          <requires eq="mingw32-libgomp-4.8.1-4-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libquadmath-4.8.1-4-mingw32-dll-0.tar" />
-        </release>
-        <release tarname="gcc-core-4.8.1-3-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgcc-4.8.1-3-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libssp-4.8.1-3-mingw32-dll-0.tar" />
-          <requires eq="mingw32-libgomp-4.8.1-3-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libquadmath-4.8.1-3-mingw32-dll-0.tar" />
-        </release>
-        <release tarname="gcc-core-4.8.1-2-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-        </release>
-        <release tarname="gcc-core-4.8.1-1-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-        </release>
+        <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
+        <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
+        <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
+        <requires eq="mingw32-libquadmath-%-mingw32-dll-0.tar" />
+        <release tarname="gcc-core-4.8.1-4-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-core-4.8.1-3-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-core-4.8.1-2-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-core-4.8.1-1-mingw32-dev.tar.lzma" />
         <release tarname="gcc-core-4.7.2-1-mingw32-dev.tar">
           <download tarname="none" />
         </release>
@@ -249,37 +215,21 @@
 
       <component class="bin">
         <affiliate group="Basic Setup" />
+        <requires eq="gcc-core-%-mingw32-bin.tar" />
         <release tarname="gcc-ada-4.8.1-4-mingw32-bin.tar.lzma">
-          <requires eq="gcc-ada-4.8.1-4-mingw32-dev.tar.lzma" />
-          <requires eq="gcc-core-4.8.1-4-mingw32-dev.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
+          <requires eq="gcc-ada-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-ada-4.8.1-3-mingw32-bin.tar.lzma">
-          <requires eq="gcc-ada-4.8.1-3-mingw32-dev.tar.lzma" />
-          <requires eq="gcc-core-4.8.1-3-mingw32-dev.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
+          <requires eq="gcc-ada-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-ada-4.8.1-2-mingw32-bin.tar.lzma">
           <requires eq="gcc-ada-%-mingw32-dev.tar.lzma" />
-          <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
         </release>
         <release tarname="gcc-ada-4.8.1-1-mingw32-bin.tar.lzma">
           <requires eq="gcc-ada-%-mingw32-dev.tar.lzma" />
-          <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
-          <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
-          <requires eq="binutils-*-mingw32-bin.tar.lzma" />
         </release>
         <release tarname="gcc-ada-4.7.2-1-mingw32-bin.tar.lzma">
           <requires eq="libgnat-%-mingw32-dll-4_7.tar" />
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
         </release>
         <release tarname="gcc-ada-4.7.0-1-mingw32-bin.tar.lzma">
           <requires eq="libgnat-%-mingw32-dll-4_7.tar" />
@@ -296,18 +246,11 @@
       </component>
 
       <component class="dev">
-        <release tarname="gcc-ada-4.8.1-4-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgnat-4.8.1-4-mingw32-dll.tar" />
-        </release>
-        <release tarname="gcc-ada-4.8.1-3-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgnat-4.8.1-3-mingw32-dll.tar" />
-        </release>
-        <release tarname="gcc-ada-4.8.1-2-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgnat-%-mingw32-dll.tar" />
-        </release>
-        <release tarname="gcc-ada-4.8.1-1-mingw32-dev.tar.lzma">
-          <requires eq="mingw32-libgnat-%-mingw32-dll.tar" />
-        </release>
+        <requires eq="mingw32-libgnat-%-mingw32-dll.tar" />
+        <release tarname="gcc-ada-4.8.1-4-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-ada-4.8.1-3-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-ada-4.8.1-2-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-ada-4.8.1-1-mingw32-dev.tar.lzma" />
       </component>
 
       <component class="info">
@@ -379,53 +322,42 @@
 
       <component class="bin">
         <affiliate group="Basic Setup" />
+        <requires eq="gcc-core-%-mingw32-bin.tar" />
         <release tarname="gcc-c++-4.8.1-4-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-c++-4.8.1-4-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-c++-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-c++-4.8.1-3-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-c++-4.8.1-3-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-c++-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-c++-4.8.1-2-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-c++-4.8.1-2-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-c++-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-c++-4.8.1-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-c++-4.8.1-1-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-c++-%-mingw32-dev.tar" />
         </release>
         <release tarname="gcc-c++-4.7.2-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libstdc++-%-mingw32-dll-6.tar" />
         </release>
         <release tarname="gcc-c++-4.7.0-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libstdc++-%-mingw32-dll-6.tar" />
         </release>
         <release tarname="gcc-c++-4.6.2-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libstdc++-%-mingw32-dll-6.tar" />
         </release>
         <release tarname="gcc-c++-4.6.1-2-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libstdc++-%-mingw32-dll-6.tar" />
         </release>
         <release tarname="gcc-c++-4.5.2-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libstdc++-%-mingw32-dll-6.tar" />
         </release>
       </component>
 
       <component class="dev">
-        <release tarname="gcc-c++-4.8.1-4-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libstdc++-4.8.1-4-mingw32-dll-6.tar" />
-        </release>
-        <release tarname="gcc-c++-4.8.1-3-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libstdc++-4.8.1-3-mingw32-dll-6.tar" />
-        </release>
-        <release tarname="gcc-c++-4.8.1-2-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libstdc++-4.8.1-2-mingw32-dll-6.tar" />
-        </release>
-        <release tarname="gcc-c++-4.8.1-1-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libstdc++-4.8.1-1-mingw32-dll-6.tar" />
-        </release>
+        <requires eq="mingw32-libstdc++-%-mingw32-dll-6.tar" />
+        <release tarname="gcc-c++-4.8.1-4-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-c++-4.8.1-3-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-c++-4.8.1-2-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-c++-4.8.1-1-mingw32-dev.tar.lzma" />
       </component>
 
       <component class="doc">
@@ -506,11 +438,12 @@
 
       <component class="bin">
         <affiliate group="Basic Setup" />
+        <requires eq="gcc-core-%-mingw32-bin.tar" />
         <release tarname="gcc-fortran-4.8.1-4-mingw32-bin.tar.lzma">
-          <requires eq="gcc-fortran-4.8.1-4-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-fortran-4.8.1-3-mingw32-bin.tar.lzma">
-          <requires eq="gcc-fortran-4.8.1-3-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-fortran-4.8.1-2-mingw32-bin.tar.lzma">
           <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
@@ -519,40 +452,28 @@
           <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-fortran-4.7.2-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libgfortran-%-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-fortran-4.7.0-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libgfortran-%-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-fortran-4.6.2-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libgfortran-%-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-fortran-4.6.1-2-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libgfortran-%-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-fortran-4.5.2-1-mingw32-bin.tar.lzma" >
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libgfortran-%-mingw32-dll-3.tar" />
         </release>
       </component>
 
       <component class="dev">
-        <release tarname="gcc-fortran-4.8.1-4-mingw32-dev.tar.lzma" >
-          <requires eq="libgfortran-4.8.1-4-mingw32-dll-3.tar" />
-        </release>
-        <release tarname="gcc-fortran-4.8.1-3-mingw32-dev.tar.lzma" >
-          <requires eq="libgfortran-4.8.1-3-mingw32-dll-3.tar" />
-        </release>
-        <release tarname="gcc-fortran-4.8.1-2-mingw32-dev.tar.lzma" >
-          <requires eq="libgfortran-4.8.1-2-mingw32-dll-3.tar" />
-        </release>
-        <release tarname="gcc-fortran-4.8.1-1-mingw32-dev.tar.lzma" >
-          <requires eq="libgfortran-4.8.1-1-mingw32-dll-3.tar" />
-        </release>
+        <requires eq="libgfortran-%-mingw32-dll-3.tar" />
+        <release tarname="gcc-fortran-4.8.1-4-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-fortran-4.8.1-3-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-fortran-4.8.1-2-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-fortran-4.8.1-1-mingw32-dev.tar.lzma" />
       </component>
 
       <component class="doc">
@@ -665,61 +586,46 @@
 
       <component class="bin">
         <affiliate group="Basic Setup" />
+        <requires eq="gcc-core-%-mingw32-bin.tar" />
         <release tarname="gcc-objc-4.7.2-1-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libobjc-%-mingw32-dll-4.tar" />
         </release>
         <release tarname="gcc-objc-4.7.0-1-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libobjc-%-mingw32-dll-4.tar" />
         </release>
         <release tarname="gcc-objc-4.6.2-1-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libobjc-%-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-objc-4.6.1-2-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libobjc-%-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-objc-4.5.2-1-mingw32-bin.tar.lzma">
-          <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libobjc-%-mingw32-dll-2.tar" />
         </release>
         <release tarname="gcc-objc-4.8.1-4-mingw32-bin.tar" >
           <download tarname="none" />
-          <requires eq="gcc-core-4.8.1-4-mingw32-bin.tar.lzma" />
-          <requires eq="gcc-objc-4.8.1-4-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-objc-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-objc-4.8.1-3-mingw32-bin.tar" >
           <download tarname="none" />
-          <requires eq="gcc-core-4.8.1-3-mingw32-bin.tar.lzma" />
-          <requires eq="gcc-objc-4.8.1-3-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-objc-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-objc-4.8.1-2-mingw32-bin.tar" >
           <download tarname="none" />
-          <requires eq="gcc-core-4.8.1-2-mingw32-bin.tar.lzma" />
-          <requires eq="gcc-objc-4.8.1-2-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-objc-%-mingw32-dev.tar.lzma" />
         </release>
         <release tarname="gcc-objc-4.8.1-1-mingw32-bin.tar" >
           <download tarname="none" />
-          <requires eq="gcc-core-4.8.1-1-mingw32-bin.tar.lzma" />
-          <requires eq="gcc-objc-4.8.1-1-mingw32-dev.tar.lzma" />
+          <requires eq="gcc-objc-%-mingw32-dev.tar.lzma" />
         </release>
       </component>
 
       <component class="dev">
-        <release tarname="gcc-objc-4.8.1-4-mingw32-dev.tar.lzma">
-          <requires eq="libobjc-4.8.1-4-mingw32-dll-4.tar" />
-        </release>
-        <release tarname="gcc-objc-4.8.1-3-mingw32-dev.tar.lzma">
-          <requires eq="libobjc-4.8.1-3-mingw32-dll-4.tar" />
-        </release>
-        <release tarname="gcc-objc-4.8.1-2-mingw32-dev.tar.lzma">
-          <requires eq="libobjc-%-mingw32-dll-4.tar" />
-        </release>
-        <release tarname="gcc-objc-4.8.1-1-mingw32-dev.tar.lzma">
-          <requires eq="libobjc-%-mingw32-dll-4.tar" />
-        </release>
+        <requires eq="libobjc-%-mingw32-dll-4.tar" />
+        <release tarname="gcc-objc-4.8.1-4-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-objc-4.8.1-3-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-objc-4.8.1-2-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-objc-4.8.1-1-mingw32-dev.tar.lzma" />
       </component>
     </package>
 
@@ -781,19 +687,19 @@
         <release tarname="libgomp-4.7.2-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgomp-4.8.1-4-mingw32-dll-1.tar" >
           <download tarname="none" />
-          <requires eq="mingw32-libgcc-4.8.1-4-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libgomp-4.8.1-3-mingw32-dll-1.tar" >
           <download tarname="none" />
-          <requires eq="mingw32-libgcc-4.8.1-3-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libgomp-4.8.1-2-mingw32-dll-1.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-2-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libgomp-4.8.1-1-mingw32-dll-1.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-1-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
       </component>
     </package>
@@ -812,19 +718,19 @@
         <release tarname="libssp-4.7.2-1-mingw32-dll-0.tar.lzma" />
         <release tarname="libssp-4.8.1-4-mingw32-dll-0.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-4-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libssp-4.8.1-3-mingw32-dll-0.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-3-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libssp-4.8.1-2-mingw32-dll-0.tar" >
           <download tarname="none" />
-          <requires eq="mingw32-libgcc-4.8.1-2-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libssp-4.8.1-1-mingw32-dll-0.tar" >
           <download tarname="none" />
-          <requires eq="mingw32-libgcc-4.8.1-1-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
       </component>
     </package>
@@ -842,19 +748,19 @@
         <release tarname="libquadmath-4.7.2-1-mingw32-dll-0.tar.lzma" />
         <release tarname="libquadmath-4.8.1-4-mingw32-dll-0.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-4-mingw32-dll-1.tar"/>
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar"/>
         </release>
         <release tarname="libquadmath-4.8.1-3-mingw32-dll-0.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-3-mingw32-dll-1.tar"/>
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar"/>
         </release>
         <release tarname="libquadmath-4.8.1-2-mingw32-dll-0.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-2-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
         <release tarname="libquadmath-4.8.1-1-mingw32-dll-0.tar" >
           <download tarname="none"/>
-          <requires eq="mingw32-libgcc-4.8.1-1-mingw32-dll-1.tar" />
+          <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
         </release>
       </component>
     </package>

diff --git a/mingw32/mingw32-runtime.xml b/mingw32/mingw32-runtime.xml
index 303def8..59a92d3 100644 (file)
--- a/mingw32/mingw32-runtime.xml
+++ b/mingw32/mingw32-runtime.xml
@@ -24,80 +24,24 @@
         </paragraph>
       </description>
 
-      <source tarname="mingwrt-%-mingw32-bld.tar.%" />
-      <licence tarname="mingwrt-%-mingw32-lic.tar.%" />
+      <source tarname="mingwrt-%-mingw32-src.tar.%" />
+      <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
 
       <component class="dev">
-        <requires eq="mingwrt-%-mingw32-dll.tar.%" />
-        <release tarname="mingwrt-4.0.3-1-mingw32-dev.tar.lzma" />
-        <release tarname="mingwrt-4.0.2-1-mingw32-dev.tar.lzma" />
-        <release tarname="mingwrt-4.0.1-1-mingw32-dev.tar.lzma" />
-        <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>
+        <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" />
       </component>
 
       <component class="dll">
-        <release tarname="mingwrt-4.0.3-1-mingw32-dll.tar.lzma" />
-        <release tarname="mingwrt-4.0.2-1-mingw32-dll.tar.lzma" />
-        <release tarname="mingwrt-4.0.1-1-mingw32-dll.tar.lzma" />
-        <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.3-1-mingw32-lic.tar.lzma" />
-        <release tarname="mingwrt-4.0.2-1-mingw32-lic.tar.lzma" />
-        <release tarname="mingwrt-4.0.1-1-mingw32-lic.tar.lzma" />
-        <release tarname="mingwrt-4.0.0-1-mingw32-lic.tar.lzma" />
-      </component>
-
-      <component class="doc">
-        <release tarname="mingwrt-4.0.3-1-mingw32-doc.tar.lzma" />
-        <release tarname="mingwrt-4.0.2-1-mingw32-doc.tar.lzma" />
-        <release tarname="mingwrt-4.0.1-1-mingw32-doc.tar.lzma" />
-        <release tarname="mingwrt-4.0.0-1-mingw32-doc.tar.lzma" />
+        <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" />
       </component>
     </package>
 
@@ -116,57 +60,15 @@
         </paragraph>
       </description>
 
-      <source tarname="w32api-%-mingw32-bld.tar.%" />
-      <licence tarname="w32api-%-mingw32-lic.tar.%" />
+      <source tarname="w32api-%-mingw32-src.tar.%" />
+      <licence tarname="w32api-%-mingw32-dev.tar.%" />
 
       <component class="dev">
-        <release tarname="w32api-4.0.3-1-mingw32-dev.tar.lzma" >
-          <requires eq="mingwrt-4.0.3-1-mingw32-dev.tar.lzma" />
-        </release>
-        <release tarname="w32api-4.0.2-1-mingw32-dev.tar.lzma" >
-          <requires eq="mingwrt-4.0.2-1-mingw32-dev.tar.lzma" />
-        </release>
-        <release tarname="w32api-4.0.1-1-mingw32-dev.tar.lzma" >
-          <requires eq="mingwrt-4.0.1-1-mingw32-dev.tar.lzma" />
-        </release>
-        <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.3-1-mingw32-lic.tar.lzma" />
-        <release tarname="w32api-4.0.2-1-mingw32-lic.tar.lzma" />
-        <release tarname="w32api-4.0.1-1-mingw32-lic.tar.lzma" />
-        <release tarname="w32api-4.0.0-1-mingw32-lic.tar.lzma" />
-      </component>
-
-      <component class="doc">
-        <release tarname="w32api-4.0.3-1-mingw32-doc.tar.lzma" />
-        <release tarname="w32api-4.0.1-1-mingw32-doc.tar.lzma" />
-        <release tarname="w32api-4.0.0-1-mingw32-doc.tar.lzma" />
+        <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" />
       </component>
     </package>
 

diff --git a/msys/issue.log b/msys/issue.log
index 664d631..e68946d 100644 (file)
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -73,7 +73,7 @@
   ec0f6517ee5afb3d8f4887dd0061b558604fd3f5 2012073100 msys-mktemp.xml
   243df0057053eebc442d922dff075e09fb579805 2012073100 msys-openssh.xml
   0103c79956ba9fa128755cd93374f0fc334c7cf6 2012073100 msys-openssl.xml
-  0defc38585dbedbe010d82bdf6e4dbbae8fb1398 2014080500 msys-package-list.xml
+  0defc38585dbedbe010d82bdf6e4dbbae8fb1398 2014082600 msys-package-list.xml
   d19e1e39e5fab25a3d40acb92b98b40a60b0da90 2012073100 msys-patch.xml
   d4f194d2e95035da2b712c54053fb6ad5d45e1d9 2013101200 msys-perl.xml
   19ddf46e23e23010a440af1b423d986712c3bda7 2012073100 msys-popt.xml