GCC update to address MinGW-Issue #39639; link with libiconv.

[mingw/mingw-dist.git] / msys / msys-bzip2.xml

diff --git a/msys/msys-bzip2.xml b/msys/msys-bzip2.xml
index b793bb6..5e6c6c8 100644 (file)
--- a/msys/msys-bzip2.xml
+++ b/msys/msys-bzip2.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-bzip2.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-bzip2">
       <affiliate group="MSYS Base System" />
-      <description lang="en" title="bzip2 (msys): a high-quality data compressor">
+      <description lang="en" title="a high-quality data compressor">
         <paragraph>bzip2 is a freely available, patent free (see below),
           high-quality data compressor. It typically compresses files
           to within 10% to 15% of the best available techniques (the
@@ -14,32 +18,47 @@
           scripts.
         </paragraph>
       </description>
+
+      <source tarname="bzip2-%-msys-%-src.tar.%" />
+      <licence tarname="bzip2-%-msys-%-lic.tar.%" />
+
       <component class="bin">
-        <!-- Note that the bzip2 utilities are linked against the static
-        version of libbz2.a, so there is no -dll dependency here. -->
-        <release tarname="bzip2-1.0.5-1-msys-1.0.11-bin.tar.gz" />
         <release tarname="bzip2-1.0.5-2-msys-1.0.13-bin.tar.lzma" />
+        <release tarname="bzip2-1.0.6-1-msys-1.0.17-bin.tar.lzma">
+         <!-- Contrary to the assertion below,
+           this release DOES appear to require the DLL component
+            -->
+         <requires eq="msys-libbz2-%-msys-%-dll-1.tar" />
+       </release>
+
+        <!-- Every MSYS package requires msys-core-bin -->
         <requires eq="msys-core-*-msys-*-bin.tar" />
-        <requires eq="msys-coreutils-*-msys-*-bin.tar" />
+
+        <!-- Note that the bzip2 utilities are linked against the static
+          version of libbz2.a, so there is no -dll dependency here.  Other
+          requirements support the auxiliary scripts, which are provided by
+          the bzip2-bin package.
+          -->
         <requires eq="msys-bash-*-msys-*-bin.tar" />
-        <requires eq="msys-less-*-msys-*-bin.tar" />
-        <requires eq="msys-grep-*-msys-*-bin.tar" />
+        <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-diffutils-*-msys-*-bin.tar" />
-        <requires eq="msys-bash-*-msys-*-bin.tar" />
+        <requires eq="msys-grep-*-msys-*-bin.tar" />
+        <requires eq="msys-less-*-msys-*-bin.tar" />
       </component>
+
       <component class="doc">
-        <release tarname="bzip2-1.0.5-1-msys-1.0.11-doc.tar.gz" />
         <release tarname="bzip2-1.0.5-2-msys-1.0.13-doc.tar.lzma" />
+        <release tarname="bzip2-1.0.6-1-msys-1.0.17-doc.tar.lzma" />
       </component>
+
       <component class="lic">
-        <release tarname="bzip2-1.0.5-1-msys-1.0.11-lic.tar.gz" />
         <release tarname="bzip2-1.0.5-2-msys-1.0.13-lic.tar.lzma" />
+        <release tarname="bzip2-1.0.6-1-msys-1.0.17-lic.tar.lzma" />
       </component>
-      <licence tarname="bzip2-%-msys-%-lic.tar" />
-      <source tarname="bzip2-%-msys-%-src.tar" />
     </package>
+
     <package name="msys-libbz2">
-      <description lang="en" title="libbz2 (msys): runtime library for bzip2">
+      <description lang="en" title="runtime library for bzip2">
         <paragraph>bzip2 is a freely available, patent free (see below),
           high-quality data compressor. It typically compresses files
           to within 10% to 15% of the best available techniques (the
@@ -49,18 +68,26 @@
           development files.
         </paragraph>
       </description>
+
+      <source tarname="bzip2-%-msys-%-src.tar.%" />
+      <licence tarname="bzip2-%-msys-%-lic.tar.%" />
+
       <component class="dll">
-        <release tarname="libbz2-1.0.5-1-msys-1.0.11-dll-1.tar.gz" />
         <release tarname="libbz2-1.0.5-2-msys-1.0.13-dll-1.tar.lzma" />
+        <release tarname="libbz2-1.0.6-1-msys-1.0.17-dll-1.tar.lzma" />
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
+
       <component class="dev">
-        <release tarname="libbz2-1.0.5-1-msys-1.0.11-dev.tar.gz" />
-        <release tarname="libbz2-1.0.5-2-msys-1.0.13-dev.tar.lzma" />
+        <release tarname="libbz2-1.0.5-2-msys-1.0.13-dev.tar.lzma">
+          <requires eq="msys-libbz2-%-msys-%-dll-1.tar.lzma" />
+        </release>
+        <release tarname="libbz2-1.0.6-1-msys-1.0.17-dev.tar.lzma">
+          <requires eq="msys-libbz2-%-msys-%-dll-1.tar.lzma" />
+        </release>
       </component>
-      <licence tarname="bzip2-%-msys-%-lic.tar" />
-      <source tarname="bzip2-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->