Rework my previous changes to help avoid ERROR issues.

diff --git a/ChangeLog b/ChangeLog
index 71e88da..c6d05e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-09-07  Earnie Boyd  <earnie@users.sourceforge.net>
+
+       Rework my previous changes to help avoid ERROR issues.
+
+       * mingw32/mingw32-binutils.xml: Change dependency to match changes in
+       mingw32-gcc4.xml and mingw32-zlib.xml.
+       * mingw32/mingw32-gcc4.xml: Rework to use libXXX package as before where
+       XXX is dependent on the compiler type.
+       * mingw32/mingw32-mpc.xml: Rework to use libmpc package as before.
+       * mingw32/mingw32-mpfr.xml: Rework to use libmpfr package as before.
+       * mingw32/mingw32-pthreads-w32.xml: Rework to use libpthread package
+       as before.
+       * mingw32/mingw32-zlib.zml: Rework to use libz package as before.
+
 2013-09-04  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Publish mingw-get release 0.6.0-beta-20130904-1.

diff --git a/common/issue.log b/common/issue.log
index f4316e6..4efa288 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 2013090401 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2013090801 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index 8d7762e..e1dd89d 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -35,7 +35,7 @@
   a14614e416d2a0aa7d4d0bbc1b30ab85e73d704b 2013090300 mingw32-expat.xml
   bc4b331f9bdfbf72a11a310fbc17a027396d09d5 2012073100 mingw32-gcc-tools.xml
   9d1d9deeccee4fb04f2944e3cd5e7b85757308ce 2011050500 mingw32-gcc3.xml
-  b60bbd190c002f707d23ead185b38ba413784bd2 2013090300 mingw32-gcc4.xml
+  8a365a35815a40e7e81f4ec3fe6eee6482080ae7 2013090800 mingw32-gcc4.xml
   2aec3c75d5ccba91607e343bcc304f3baf24ae56 2012082702 mingw32-gdb.xml
   14dd10ab97b27430bdb688f4e85993cd821f7a05 2012073100 mingw32-gendef.xml
   e96f16b3e2b203b30e719f840acb0bed5a44226a 2013090300 mingw32-gettext.xml
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   d0657d9bc4fd5fa5bae78d80f003485cfde305c3 2013082300 mingw32-mpc.xml
   9c47305797d932da02275a6894b30492440af00e 2013082300 mingw32-mpfr.xml
-  983af8ad24a6f97da867784dfeeecc6661d54d88 2013090400 mingw32-package-list.xml
+  983af8ad24a6f97da867784dfeeecc6661d54d88 2013090800 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   7e22a7d22719059c28dcb37b7a48806070964b09 2013082800 mingw32-pthreads-w32.xml

diff --git a/mingw32/mingw32-binutils.xml b/mingw32/mingw32-binutils.xml
index c84358e..e65014e 100644 (file)
--- a/mingw32/mingw32-binutils.xml
+++ b/mingw32/mingw32-binutils.xml
@@ -24,9 +24,9 @@
 
       <component class="bin">
        <release tarname="binutils-2.23.2-1-mingw32-bin.tar.lzma" >
-         <requires eq="gcc-core-4.8.1-1-mingw32-dll.tar.lzma" />
-         <requires eq="zlib-1.2.8-1-mingw32-dll.tar.lzma" />
          <requires eq="binutils-%-mingw32-dev.tar.lzma" />
+         <requires eq="mingw32-libz-*-dll-1.tar" />
+         <requires eq="mingw32-libgcc-*-dll-1.tar" />
        </release>
         <release tarname="binutils-2.23.1-1-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />

diff --git a/mingw32/mingw32-gcc4.xml b/mingw32/mingw32-gcc4.xml
index 0fa2b58..8c185fb 100644 (file)
--- a/mingw32/mingw32-gcc4.xml
+++ b/mingw32/mingw32-gcc4.xml
@@ -96,22 +96,9 @@
         </release>
       </component>
 
-      <component class="dll">
-       <release tarname="gcc-core-4.8.1-1-mingw32-dll.tar.lzma">
-         <requires eq="libgcc-%-mingw32-dll-0.tar" />
-         <requires eq="libgomp-%-mingw32-dll-0.tar" />
-         <requires eq="libssp-%-mingw32-dll-0.tar" />
-         <requires eq="libquadmath-%-mingw32-dll-0.tar" />
-         <requires eq="mpc-1.0.1-1-mingw32-dll.tar.lzma" />
-         <requires eq="gmp-5.1.2-1-mingw32-dll.tar.lzma" />
-         <requires eq="mpfr-3.1.2-1-mingw32-dll.tar.lzma" />
-         <requires eq="zlib-1.2.8-1-mingw32-dll.tar.lzma" />
-       </release>
-      </component>
-
       <component class="dev">
        <release tarname="gcc-core-4.8.1-1-mingw32-dev.tar.lzma">
-         <requires eq="gcc-core-%-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
        </release>
       </component>
 
@@ -168,14 +155,15 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+       <release tarname="libgcc-4.8.1-1-mingw32-dll-1.tar">
+         <download tarname="gcc-core-4.8.1-1-mingw32-dll.tar.lzma"/>
+         <requires eq="mingw32-libmpc-*-mingw32-dll-2.tar" />
+       </release>
         <release tarname="libgcc-4.5.2-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgcc-4.6.1-2-mingw32-dll-1.tar.lzma" />
         <release tarname="libgcc-4.6.2-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgcc-4.7.0-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgcc-4.7.2-1-mingw32-dll-1.tar.lzma" />
-       <release tarname="libgcc-4.8.1-1-mingw32-dll-0.tar" >
-         <download tarname="none" />
-       </release>
       </component>
     </package>
 
@@ -293,11 +281,7 @@
 
       <component class="bin">
        <release tarname="gcc-c++-4.8.1-1-mingw32-bin.tar.lzma" >
-         <requires eq="gcc-c++-%-mingw32-dev.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-c++-4.8.1-1-mingw32-dev.tar.lzma" />
        </release>
         <release tarname="gcc-c++-4.7.2-1-mingw32-bin.tar.lzma" >
          <requires eq="gcc-core-%-mingw32-bin.tar" />
@@ -321,15 +305,9 @@
        </release>
       </component>
 
-      <component class="dll">
-       <release tarname="gcc-c++-4.8.1-1-mingw32-dll.tar.lzma" >
-         <requires eq="libstdc++-4.8.1-1-mingw32-dll-0.tar" />
-       </release>
-      </component>
-
       <component class="dev">
        <release tarname="gcc-c++-4.8.1-1-mingw32-dev.tar.lzma" >
-         <requires eq="gcc-c++-%-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libstdc++-4.8.1-1-mingw32-dll-6.tar" />
        </release>
       </component>
 
@@ -365,15 +343,16 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+       <release tarname="libstdc++-4.8.1-1-mingw32-dll-6.tar" >
+         <download tarname="gcc-c++-4.8.1-1-mingw32-dll.tar.lzma" />
+       </release>
         <release tarname="libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma" />
         <release tarname="libstdc++-4.6.1-2-mingw32-dll-6.tar.lzma" />
         <release tarname="libstdc++-4.6.2-1-mingw32-dll-6.tar.lzma" />
         <release tarname="libstdc++-4.7.0-1-mingw32-dll-6.tar.lzma" />
         <release tarname="libstdc++-4.7.2-1-mingw32-dll-6.tar.lzma" />
-       <release tarname="libstdc++-4.8.1-1-mingw32-dll-0.tar" >
-         <download tarname="none"/>
-       </release>
       </component>
+
     </package>
 
     <package name="mingw32-gcc-fortran" alias="gcc-fortran gfortran fortran">
@@ -397,8 +376,6 @@
       <component class="bin">
        <release tarname="gcc-fortran-4.8.1-1-mingw32-bin.tar.lzma">
          <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
-         <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
-         <requires eq="binutils-*-mingw32-bin.tar.lzma" />
        </release>
         <release tarname="gcc-fortran-4.7.2-1-mingw32-bin.tar.lzma" >
          <requires eq="gcc-core-%-mingw32-bin.tar" />
@@ -422,15 +399,9 @@
        </release>
       </component>
 
-      <component class="dll">
-       <release tarname="gcc-fortran-4.8.1-1-mingw32-dll.tar.lzma" >
-         <requires eq="libgfortran-%-mingw32-dll-0.tar" />
-       </release>
-      </component>
-
       <component class="dev">
        <release tarname="gcc-fortran-4.8.1-1-mingw32-dev.tar.lzma" >
-         <requires eq="gcc-fortran-%-mingw32-dll.tar.lzma" />
+         <requires eq="libgfortran-4.8.1-1-mingw32-dll-3.tar" />
        </release>
       </component>
 
@@ -472,8 +443,8 @@
         <release tarname="libgfortran-4.6.2-1-mingw32-dll-3.tar.lzma" />
         <release tarname="libgfortran-4.7.0-1-mingw32-dll-3.tar.lzma" />
         <release tarname="libgfortran-4.7.2-1-mingw32-dll-3.tar.lzma" />
-       <release tarname="libgfortran-4.8.1-1-mingw32-dll-0.tar" >
-         <download tarname="none" />
+       <release tarname="libgfortran-4.8.1-1-mingw32-dll-3.tar" >
+         <download tarname="gcc-fortran-4.8.1-1-mingw32-dll.tar.lzma" />
        </release>
       </component>
     </package>
@@ -613,8 +584,9 @@
         <release tarname="libgomp-4.6.2-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgomp-4.7.0-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgomp-4.7.2-1-mingw32-dll-1.tar.lzma" />
-       <release tarname="libgomp-4.8.1-1-mingw32-dll-0.tar" >
+       <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" />
        </release>
       </component>
     </package>
@@ -633,6 +605,7 @@
         <release tarname="libssp-4.7.2-1-mingw32-dll-0.tar.lzma" />
        <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" />
        </release>
       </component>
     </package>
@@ -650,6 +623,7 @@
         <release tarname="libquadmath-4.7.2-1-mingw32-dll-0.tar.lzma" />
        <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" />
        </release>
       </component>
     </package>

diff --git a/mingw32/mingw32-gmp.xml b/mingw32/mingw32-gmp.xml
index 9abaf10..b8ce754 100644 (file)
--- a/mingw32/mingw32-gmp.xml
+++ b/mingw32/mingw32-gmp.xml
@@ -38,7 +38,7 @@
 
       <component class="dev">
        <release tarname="gmp-5.1.2-1-mingw32-dev.tar.lzma" >
-         <requires eq="gmp-5.1.2-1-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libgmpxx-%-mingw32-dll-4.tar" />
        </release>
         <release tarname="gmp-5.0.1-1-mingw32-dev.tar.lzma" >
           <requires eq="mingw32-libgmp-%-mingw32-dll-10.tar" />
@@ -46,10 +46,6 @@
         </release>
       </component>
 
-      <component class="dll">
-        <release tarname="gmp-5.1.2-1-mingw32-dll.tar.lzma" />
-      </component>
-
       <component class="doc">
         <release tarname="gmp-5.1.2-1-mingw32-doc.tar.lzma" />
         <release tarname="gmp-5.0.1-1-mingw32-doc.tar.lzma" />
@@ -96,6 +92,9 @@
       <licence tarname="gmp-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+        <release tarname="libgmp-5.1.2-1-mingw32-dll-10.tar" >
+         <download tarname="gmp-5.1.2-1-mingw32-dll.tar.lzma" />
+       </release>
         <release tarname="libgmp-5.0.1-1-mingw32-dll-10.tar.lzma" />
       </component>
     </package>
@@ -121,6 +120,10 @@
       <licence tarname="gmp-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+        <release tarname="libgmpxx-5.1.2-1-mingw32-dll-4.tar.lzma" >
+         <download tarname="none" />
+          <requires eq="libgmp-%-mingw32-dll-10.tar" />
+        </release>
         <release tarname="libgmpxx-5.0.1-1-mingw32-dll-4.tar.lzma" >
           <requires eq="libgmp-%-mingw32-dll-10.tar" />
           <requires eq="libgcc-*-mingw32-dll-1.tar" />

diff --git a/mingw32/mingw32-mpc.xml b/mingw32/mingw32-mpc.xml
index 8573a8b..85b88b6 100644 (file)
--- a/mingw32/mingw32-mpc.xml
+++ b/mingw32/mingw32-mpc.xml
@@ -29,7 +29,8 @@
 
       <component class="dev">
        <release tarname="mpc-1.0.1-1-mingw32-dev.tar.lzma" >
-         <requires eq="mpc-1.0.1-1-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libmpc-%-mingw32-dll-2.tar" />
+         <requires eq="mpfr-3.1.2-1-mingw32-dev.tar.lzma" />
        </release>
         <release tarname="mpc-0.8.1-1-mingw32-dev.tar.lzma" >
           <requires eq="mingw32-libmpc-%-mingw32-dll-2.tar" />
@@ -46,12 +47,6 @@
         <release tarname="mpc-0.8.1-1-mingw32-lic.tar.lzma" />
       </component>
 
-      <component class="dll">
-        <release tarname="mpc-1.0.1-1-mingw32-dll.tar.lzma" >
-         <requires eq="mpfr-3.1.2-1-mingw32-dll.tar.lzma" />
-         <requires eq="gmp-5.1.2-1-mingw32-dll.tar.lzma" />
-       </release>
-      </component>
     </package>
 
     <package name="mingw32-libmpc" alias="libmpc">
@@ -77,6 +72,11 @@
       <licence tarname="mpc-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+        <release tarname="libmpc-1.0.1-1-mingw32-dll-2.tar" >
+         <download tarname="mpc-1.0.1-1-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libmpfr-*-mingw32-dll-1.tar" />
+         <requires eq="mingw32-libgmp-*-mingw32-dll-10.tar" />
+       </release>
         <release tarname="libmpc-0.8.1-1-mingw32-dll-2.tar.lzma" >
           <requires eq="mingw32-libmpfr-*-mingw32-dll-1.tar" />
           <requires eq="mingw32-libgmp-*-mingw32-dll-10.tar" />

diff --git a/mingw32/mingw32-mpfr.xml b/mingw32/mingw32-mpfr.xml
index 713187a..f7e991f 100644 (file)
--- a/mingw32/mingw32-mpfr.xml
+++ b/mingw32/mingw32-mpfr.xml
@@ -33,7 +33,8 @@
 
       <component class="dev">
        <release tarname="mpfr-3.1.2-1-mingw32-dev.tar.lzma" >
-         <requires eq="mpfr-3.1.2-1-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libmpfr-%-mingw32-dll-1.tar" />
+         <requires eq="gmp-5.1.2-1-mingw32-dev.tar.lzma" />
        </release>
         <release tarname="mpfr-2.4.1-1-mingw32-dev.tar.lzma" >
           <requires eq="mingw32-libmpfr-%-mingw32-dll-1.tar" />
@@ -50,11 +51,6 @@
         <release tarname="mpfr-2.4.1-1-mingw32-lic.tar.lzma" />
       </component>
 
-      <component class="dll">
-       <release tarname="mpfr-3.1.2-1-mingw32-dll.tar.lzma" >
-         <requires eq="gmp-5.1.2-1-mingw32-dll.tar.lzma" />
-       </release>
-      </component>
     </package>
 
     <package name="mingw32-libmpfr" alias="libmpfr">
@@ -86,6 +82,10 @@
         <release tarname="libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma" >
           <requires eq="mingw32-libgmp-*-mingw32-dll-10.tar" />
         </release>
+       <release tarname="libmpfr-3.1.2-1-mingw32-dll-1.tar" >
+         <download tarname="mpfr-3.1.2-1-mingw32-dll.tar.lzma" />
+         <requires eq="mingw32-libgmp-*-mingw32-dll-10.tar" />
+       </release>
       </component>
     </package>
 

diff --git a/mingw32/mingw32-pthreads-w32.xml b/mingw32/mingw32-pthreads-w32.xml
index 14b1311..eb21080 100644 (file)
--- a/mingw32/mingw32-pthreads-w32.xml
+++ b/mingw32/mingw32-pthreads-w32.xml
@@ -28,7 +28,9 @@
       <licence tarname="pthreads-w32-%-mingw32-%-lic.tar.lzma" />
 
       <component class="dev">
-       <release tarname="pthreads-w32-2.9.1-1-mingw32-dev.tar.lzma"/>
+       <release tarname="pthreads-w32-2.9.1-1-mingw32-dev.tar.lzma">
+          <requires eq="mingw32-libpthread-%-mingw32-dll-2.tar" />
+       </release>
         <release tarname="pthreads-w32-2.8.0-3-mingw32-dev.tar.lzma" >
           <requires eq="mingw32-libpthread-%-mingw32-dll-2.tar" />
         </release>
@@ -49,9 +51,6 @@
         <release tarname="pthreads-w32-2.8.0-3-mingw32-lic.tar.lzma" />
       </component>
 
-      <component class="dll">
-       <release tarname="pthreads-w32-2.9.1-1-mingw32-dll.tar.lzma" />
-      </component>
     </package>
 
     <package name="mingw32-libpthreadgc" alias="libpthreadgc mingw32-libpthread libpthread">
@@ -97,6 +96,9 @@
       <licence tarname="pthreads-w32-%-mingw32-%-lic.tar.lzma" />
 
       <component class="dll">
+       <release tarname="libpthread-2.9.1-1-mingw32-dll-2.tar" >
+         <download tarname="pthreads-w32-2.9.1-1-mingw32-dll.tar.lzma" />
+       </release>
         <release tarname="libpthread-2.8.0-3-mingw32-dll-2.tar.lzma" />
         <release tarname="libpthreadgc-2.9.0-mingw32-pre-20110507-2-dll-2.tar.lzma" />
       </component>
@@ -142,6 +144,10 @@
       <licence tarname="pthreads-w32-%-mingw32-%-lic.tar.lzma" />
 
       <component class="dll">
+       <release tarname="libpthreadgce-2.9.1-1-mingw32-dll-2.tar" >
+         <download tarname="none" />
+         <requires eq="mingw32-libpthread-2.9.1-1-mingw32-dll-2.tar" />
+       </release>
         <release tarname="libpthreadgce-2.9.0-mingw32-pre-20110507-2-dll-2.tar.lzma" />
       </component>
     </package>

diff --git a/mingw32/mingw32-zlib.xml b/mingw32/mingw32-zlib.xml
index 8b1f29c..e4ee0ac 100644 (file)
--- a/mingw32/mingw32-zlib.xml
+++ b/mingw32/mingw32-zlib.xml
@@ -7,33 +7,16 @@
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
 
     <package name="mingw32-zlib" alias="zlib">
-      <affiliate group="MinGW Standard Libraries" />
       <description lang="en" title="A Massively Spiffy Yet Delicately Unobtrusive Compression Library">
         <paragraph>The zlib compression library provides in-memory compression
           and decompression functions, including integrity checks of the
           uncompressed data.
         </paragraph>
-        <paragraph>Prior to the 1.2.8-1 release, the mingw32-zlib package
-          provided only documentation related to the ZLib library; the runtime
-          and development files were provided by the associated mingw32-libz
-          package.  From the 1.2.8-1 release onwards, these additional
-          components have been subsumed into this main package set.
-        </paragraph>
       </description>
 
       <licence tarname="zlib-%-mingw32-%-lic.tar.%" />
       <source tarname="zlib-%-mingw32-%-src.tar.%" />
 
-      <component class="dll">
-        <release tarname="zlib-1.2.8-1-mingw32-dll.tar.lzma" />
-      </component>
-
-      <component class="dev">
-        <release tarname="zlib-1.2.8-1-mingw32-dev.tar.lzma" >
-         <requires tarname="zlib-1.2.8-1-mingw32-dll.tar.lzma" />
-       </release>
-      </component>
-
       <component class="doc">
         <release tarname="zlib-1.2.8-1-mingw32-doc.tar.lzma" />
         <release tarname="zlib-1.2.7-1-mingw32-doc.tar.lzma" />
@@ -61,9 +44,6 @@
 
     <package name="mingw32-libz" alias="libz">
       <description lang="en" title="A Massively Spiffy Yet Delicately Unobtrusive Compression Library">
-        <paragraph>NOTE: The zlib DLL and development package is delivered in
-          the primary zlib package release as of zlib-1.2.8-1.
-        </paragraph>
         <paragraph>The zlib compression library provides in-memory compression
           and decompression functions, including integrity checks of the
           uncompressed data. The libz package provides the runtime and
@@ -71,6 +51,7 @@
           package provides documentation.
         </paragraph>
       </description>
+      <affiliate group="Mingw Standard Libraries"/>
 
       <licence tarname="zlib-%-mingw32-%-lic.tar.%" />
       <source tarname="zlib-%-mingw32-%-src.tar.%" />
@@ -86,8 +67,8 @@
         <release tarname="libz-1.2.7-1-mingw32-dll-1.tar.lzma" >
           <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
         </release>
-       <release tarname="libz-1.2.8-1-mingw32-dll-0.tar" >
-         <download tarname="none" />
+       <release tarname="libz-1.2.8-1-mingw32-dll-1.tar">
+         <download tarname="zlib-1.2.8-1-mingw32-dll.tar.lzma" />
        </release>
       </component>
 
@@ -104,9 +85,9 @@
         <release tarname="libz-1.2.7-1-mingw32-dev.tar.lzma" >
           <requires eq="mingw32-libz-%-mingw32-%-dll-1.tar" />
         </release>
-       <release tarname="libz-1.2.8-1-mingw32-dev-0.tar" >
-         <download tarname="none" />
-         <requires eq="zlib-1.2.8-1-mingw32-dev.tar.lzma" />
+       <release tarname="libz-1.2.8-1-mingw32-dev-1.tar" >
+         <download tarname="zlib-1.2.8-1-mingw32-dev.tar.lzma" />
+         <requires eq="mingw32-libz-%-mingw32-dll-1.tar" />
        </release>
       </component>
     </package>
@@ -129,6 +110,7 @@
           met by the libarchive package.
         </paragraph>
       </description>
+      <affilate group="MinGW Deprecated Packages" />
 
       <licence tarname="zlib-%-mingw32-%-lic.tar.%" />
       <source tarname="zlib-%-mingw32-%-src.tar.%" />