Minor updates to distinguish packages from mingw32 versions

diff --git a/msys/msys-bzip2.xml b/msys/msys-bzip2.xml
index 2fbf0da..8438258 100644 (file)
--- a/msys/msys-bzip2.xml
+++ b/msys/msys-bzip2.xml
@@ -4,7 +4,7 @@
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
     <package name="msys-bzip2">
       <affiliate group="MSYS Developer Toolkit" />
-      <description lang="en" title="bzip2: a high-quality data compressor">
+      <description lang="en" title="bzip2 (msys): 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
@@ -33,8 +33,7 @@
       <source tarname="bzip2-%-msys-%-src.tar" />
     </package>
     <package name="msys-libbz2">
-      <affiliate group="MSYS Developer Toolkit" />
-      <description lang="en" title="libbz2: runtime library for bzip2">
+      <description lang="en" title="libbz2 (msys): 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

diff --git a/msys/msys-expat.xml b/msys/msys-expat.xml
index 8259abe..97ae98d 100644 (file)
--- a/msys/msys-expat.xml
+++ b/msys/msys-expat.xml
@@ -3,7 +3,7 @@
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
     <package name="msys-expat">
-      <description lang="en" title="expat: XML parsing library written in C">
+      <description lang="en" title="expat (msys): XML parsing library written in C">
         <paragraph>expat is a C library for parsing XML written by James
           Clark. Expat is a stream-oriented XML parser.  This means that
           you register handlers with the parser before starting the parse.
@@ -33,8 +33,7 @@
       <source tarname="expat-%-msys-%-src.tar" />
     </package>
     <package name="msys-libexpat">
-      <affiliate group="MSYS Developer Toolkit" />
-      <description lang="en" title="libexpat: XML parsing library written in C">
+      <description lang="en" title="libexpat (msys): XML parsing library written in C">
         <paragraph>expat is a C library for parsing XML written by James
           Clark. Expat is a stream-oriented XML parser.  This means that
           you register handlers with the parser before starting the parse.
@@ -55,6 +54,7 @@
       </component>
       <component class="dev">
         <release tarname="libexpat-2.0.1-1-msys-1.0.13-dev.tar.lzma" />
+        <requires eq="msys-libexpat-*-msys-*-dll-1.tar" />
       </component>
       <licence tarname="expat-%-msys-%-lic.tar" />
       <source tarname="expat-%-msys-%-src.tar" />

diff --git a/msys/msys-zlib.xml b/msys/msys-zlib.xml
index 834df69..709829c 100644 (file)
--- a/msys/msys-zlib.xml
+++ b/msys/msys-zlib.xml
@@ -3,8 +3,7 @@
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
     <package name="msys-zlib">
-      <affiliate group="MSYS Developer Toolkit" />
-      <description lang="en" title="ZLib: A Massively Spiffy Yet Delicately Unobtrusive Compression Library">
+      <description lang="en" title="ZLib (msys): 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.