Add less, diffutils, tar, gzip, bzip2 and xz (lzma) to msys-base.

diff --git a/ChangeLog b/ChangeLog
index 0bbcd4f..fb1a12f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,28 @@
 
        * msys/msys-gcc.xml: Use correct attribute in component tag.
 
+2010-07-28  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Add less, diffutils, tar, gzip, bzip2 and xz (lzma) to msys-base.
+
+       * msys/msys-package-list.xml: Expose manifest references for...
+       (msys-less, msys-diffutils, msys-tar, msys-gzip, msys-bzip2):
+       (msys-xz): ...these packages.
+
+       * msys/msys-base.xml (msys-base): Add dependencies...
+       (msys-less-bin, msys-diffutils-bin, msys-tar-bin, msys-gzip-bin):
+       (msys-bzip2-bin, msys-xz-bin): ...on these.
+
+       * msys/msys-less.xml msys/msys-diffutils msys/msys-gzip.xml:
+       * msys/msys-bzip2.xml msys/msys-xz.xml: Clean up formatting; reduce to
+       deliver only latest versions of all package components.
+
+       * msys/msys-tar.xml: Clean up formatting; reduce to deliver only
+       latest versions of all package components; add missing dependencies...
+       (msys-gzip-bin, msys-bzip2-bin, msys-xz-bin): ...on these.
+
+       * msys/issue.log: Updated.
+
 2010-07-27  Charles Wilson  <mingw@cwilson.fastmail.fm>
 
        * msys/msys-core.xml (msys-core-bin): Require -lic and -doc cpts.

diff --git a/msys/issue.log b/msys/issue.log
index d820d4b..37a03f0 100644 (file)
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -23,17 +23,23 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
-  msys-base.xml:2010072600
+  msys-base.xml:2010072800
   msys-bash.xml:2010071901
+  msys-bzip2.xml:2010072800
   msys-coreutils.xml:2010071901
   msys-core.xml:2010072600
+  msys-diffutils.xml:2010072800
   msys-gawk.xml:2010072600
   msys-gettext.xml:2010071900
   msys-grep.xml:2010072600
+  msys-gzip.xml:2010072800
+  msys-less.xml:2010072800
   msys-libiconv.xml:2010071900
-  msys-package-list.xml:2010072600
+  msys-package-list.xml:2010072800
   msys-regex.xml:2010071900
   msys-sed.xml:2010072600
+  msys-tar.xml:2010072800
   msys-termcap.xml:2010071900
+  msys-xz.xml:2010072800
 #
 # $RCSfile$: end of file

diff --git a/msys/msys-base.xml b/msys/msys-base.xml
index 59f1ea1..f35df67 100644 (file)
--- a/msys/msys-base.xml
+++ b/msys/msys-base.xml
@@ -43,11 +43,17 @@
       <component class="bin">
         <release tarname="msys-base-@YYYYMMDDNN@-msys-bin.meta" />
         <requires eq="msys-bash-*-msys-*-bin.tar" />
+        <requires eq="msys-bzip2-*-msys-*-bin.tar" />
         <requires eq="msys-core-*-msys-*-ext.tar" />
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
+        <requires eq="msys-diffutils-*-msys-*-bin.tar" />
         <requires eq="msys-gawk-*-msys-*-bin.tar" />
         <requires eq="msys-grep-*-msys-*-bin.tar" />
+        <requires eq="msys-gzip-*-msys-*-bin.tar" />
+        <requires eq="msys-less-*-msys-*-bin.tar" />
         <requires eq="msys-sed-*-msys-*-bin.tar" />
+        <requires eq="msys-tar-*-msys-*-bin.tar" />
+        <requires eq="msys-xz-*-msys-*-bin.tar" />
       </component>
     </package>
 

diff --git a/msys/msys-bzip2.xml b/msys/msys-bzip2.xml
index 9cccfb4..b29c9d0 100644 (file)
--- a/msys/msys-bzip2.xml
+++ b/msys/msys-bzip2.xml
@@ -1,7 +1,11 @@
 <?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">
@@ -14,30 +18,37 @@
           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" />
+
+        <!-- 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" />
       </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" />
       </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">
         <paragraph>bzip2 is a freely available, patent free (see below),
@@ -49,19 +60,20 @@
           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" />
         <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" />
       </component>
-      <licence tarname="bzip2-%-msys-%-lic.tar" />
-      <source tarname="bzip2-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-diffutils.xml b/msys/msys-diffutils.xml
index 15f4c10..5f186c1 100644 (file)
--- a/msys/msys-diffutils.xml
+++ b/msys/msys-diffutils.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-diffutils.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-diffutils">
       <affiliate group="MSYS Base System" />
       <description lang="en" title="diffutils: GNU collection of diff utilities" >
@@ -20,28 +24,30 @@
           both persons' changes along with warnings about conflicts.
         </paragraph>
       </description>
+
+      <source tarname="diffutils-%-msys-%-src.tar" />
+      <licence tarname="diffutils-%-msys-%-lic.tar" />
+
       <component class="bin">
-        <release tarname="diffutils-2.8.7.20071206cvs-2-msys-1.0.11-bin.tar.lzma" />
         <release tarname="diffutils-2.8.7.20071206cvs-3-msys-1.0.13-bin.tar.lzma" >
           <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
         </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
+
       <component class="lang">
         <release tarname="diffutils-2.8.7.20071206cvs-3-msys-1.0.13-lang.tar.lzma" />
       </component>
+
       <component class="doc">
-        <release tarname="diffutils-2.8.7.20071206cvs-2-msys-1.0.11-doc.tar.lzma" />
         <release tarname="diffutils-2.8.7.20071206cvs-3-msys-1.0.13-doc.tar.lzma" />
       </component>
+
       <component class="lic">
-        <release tarname="diffutils-2.8.7.20071206cvs-2-msys-1.0.11-lic.tar.lzma" />
         <release tarname="diffutils-2.8.7.20071206cvs-3-msys-1.0.13-lic.tar.lzma" />
       </component>
-      <licence tarname="diffutils-%-msys-%-lic.tar" />
-      <source tarname="diffutils-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-gzip.xml b/msys/msys-gzip.xml
index b3402b3..57beb54 100644 (file)
--- a/msys/msys-gzip.xml
+++ b/msys/msys-gzip.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-gzip.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-gzip">
       <affiliate group="MSYS Base System" />
       <description lang="en" title="gzip: compress or expand files" >
@@ -19,28 +23,35 @@
           program on unix, and is universally available.
         </paragraph>
       </description>
+
+      <source tarname="gzip-%-msys-%-src.tar" />
+      <licence tarname="gzip-%-msys-%-lic.tar" />
+
       <component class="bin">
-        <release tarname="gzip-1.3.12-1-msys-1.0.11-bin.tar.lzma" />
         <release tarname="gzip-1.3.12-2-msys-1.0.13-bin.tar.lzma" />
+
+        <!-- Every MSYS package requires msys-core-bin -->
         <requires eq="msys-core-*-msys-*-bin.tar" />
-        <requires eq="msys-coreutils-*-msys-*-bin.tar" />
+
+        <!-- Other requirements support the auxiliary scripts,
+          which are provided by the gzip-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-grep-*-msys-*-bin.tar" />
+        <requires eq="msys-less-*-msys-*-bin.tar" />
       </component>
+
       <component class="doc">
-        <release tarname="gzip-1.3.12-1-msys-1.0.11-doc.tar.lzma" />
         <release tarname="gzip-1.3.12-2-msys-1.0.13-doc.tar.lzma" />
       </component>
+
       <component class="lic">
-        <release tarname="gzip-1.3.12-1-msys-1.0.11-lic.tar.lzma" />
         <release tarname="gzip-1.3.12-2-msys-1.0.13-lic.tar.lzma" />
       </component>
-      <licence tarname="gzip-%-msys-%-lic.tar" />
-      <source tarname="gzip-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-less.xml b/msys/msys-less.xml
index 1fe31a5..497f781 100644 (file)
--- a/msys/msys-less.xml
+++ b/msys/msys-less.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-less.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-less">
       <affiliate group="MSYS Base System" />
       <description lang="en" title="less: command-line text file viewer" >
@@ -20,26 +24,27 @@
           terminals.
         </paragraph>
       </description>
+
+      <source tarname="less-%-msys-%-src.tar" />
+      <licence tarname="less-%-msys-%-lic.tar" />
+
       <component class="bin">
-        <release tarname="less-436-1-msys-1.0.11-bin.tar.lzma" />
         <release tarname="less-436-2-msys-1.0.13-bin.tar.lzma" >
           <requires eq="msys-libtermcap-*-msys-*-dll-0.tar" />
         </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
         <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
       </component>
+
       <component class="doc">
-        <release tarname="less-436-1-msys-1.0.11-doc.tar.lzma" />
         <release tarname="less-436-2-msys-1.0.13-doc.tar.lzma" />
       </component>
+
       <component class="lic">
-        <release tarname="less-436-1-msys-1.0.11-lic.tar.lzma" />
         <release tarname="less-436-2-msys-1.0.13-lic.tar.lzma" />
       </component>
-      <licence tarname="less-%-msys-%-lic.tar" />
-      <source tarname="less-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-package-list.xml b/msys/msys-package-list.xml
index df964f9..ed3115d 100644 (file)
--- a/msys/msys-package-list.xml
+++ b/msys/msys-package-list.xml
@@ -26,7 +26,7 @@
   <package-list catalogue="msys-bash" />
   <!--package-list catalogue="msys-binutils" /-->
   <!--package-list catalogue="msys-bison" /-->
-  <!--package-list catalogue="msys-bzip2" /-->
+  <package-list catalogue="msys-bzip2" />
   <!--package-list catalogue="msys-console" /-->
   <package-list catalogue="msys-core" />
   <package-list catalogue="msys-coreutils" />
@@ -34,7 +34,7 @@
   <!--package-list catalogue="msys-cvs" /-->
   <!--package-list catalogue="msys-cygutils" /-->
   <!--package-list catalogue="msys-dash" /-->
-  <!--package-list catalogue="msys-diffutils" /-->
+  <package-list catalogue="msys-diffutils" />
   <!--package-list catalogue="msys-expat" /-->
   <!--package-list catalogue="msys-file" /-->
   <!--package-list catalogue="msys-findutils" /-->
@@ -47,9 +47,9 @@
   <package-list catalogue="msys-grep" />
   <!--package-list catalogue="msys-groff" /-->
   <!--package-list catalogue="msys-guile" /-->
-  <!--package-list catalogue="msys-gzip" /-->
+  <package-list catalogue="msys-gzip" />
   <!--package-list catalogue="msys-inetutils" /-->
-  <!--package-list catalogue="msys-less" /-->
+  <package-list catalogue="msys-less" />
   <!--package-list catalogue="msys-libarchive" /-->
   <package-list catalogue="msys-libiconv" />
   <!--package-list catalogue="msys-libtool" /-->
@@ -70,14 +70,14 @@
   <package-list catalogue="msys-regex" />
   <!--package-list catalogue="msys-rxvt" /-->
   <package-list catalogue="msys-sed" />
-  <!--package-list catalogue="msys-tar" /-->
+  <package-list catalogue="msys-tar" />
   <package-list catalogue="msys-termcap" />
   <!--package-list catalogue="msys-texinfo" /-->
   <!--package-list catalogue="msys-unzip" /-->
   <!--package-list catalogue="msys-vim" /-->
   <!--package-list catalogue="msys-w32api" /-->
   <!--package-list catalogue="msys-wget" /-->
-  <!--package-list catalogue="msys-xz" /-->
+  <package-list catalogue="msys-xz" />
   <!--package-list catalogue="msys-zip" /-->
   <!--package-list catalogue="msys-zlib" /-->
 

diff --git a/msys/msys-tar.xml b/msys/msys-tar.xml
index 40f51ec..a1cefa4 100644 (file)
--- a/msys/msys-tar.xml
+++ b/msys/msys-tar.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-tar.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-tar">
       <affiliate group="MSYS Base System" />
       <description lang="en" title="tar: GNU tar archiver tool">
@@ -36,20 +40,33 @@
           will meet most needs.
         </paragraph>
       </description>
+
+      <source tarname="tar-%-msys-%-src.tar" />
+      <licence tarname="tar-%-msys-%-lic.tar" />
+
       <component class="bin">
-        <release tarname="tar-1.22-1-msys-1.0.11-bin.tar.lzma" />
-        <release tarname="tar-1.23-1-msys-1.0.13-bin.tar.lzma" >
+        <release tarname="tar-1.23-1-msys-1.0.13-bin.tar.lzma">
           <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
           <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
         </release>
+
+        <!-- Every MSYS package requires msys-core-bin -->
         <requires eq="msys-core-*-msys-*-bin.tar" />
+
+        <!-- Additional packages are required, to support processing
+          of compressed archives.
+          -->
+        <requires eq="msys-bzip2-*-msys-*-bin.tar" />
+        <requires eq="msys-gzip-*-msys-*-bin.tar" />
+        <requires eq="msys-xz-*-msys-*-bin.tar" />
       </component>
+
       <component class="lang">
         <release tarname="tar-1.23-1-msys-1.0.13-lang.tar.lzma" />
       </component>
+
       <component class="ext">
-        <release tarname="tar-1.22-1-msys-1.0.11-ext.tar.lzma" />
         <release tarname="tar-1.23-1-msys-1.0.13-ext.tar.lzma" />
         <requires eq="msys-tar-%-msys-%-bin.tar" />
         <requires eq="msys-core-*-msys-*-bin.tar" />
@@ -57,18 +74,16 @@
         <requires eq="msys-sed-*-msys-*-bin.tar" />
         <requires eq="msys-bash-*-msys-*-bin.tar" />
       </component>
+
       <component class="doc">
-        <release tarname="tar-1.22-1-msys-1.0.11-doc.tar.lzma" />
         <release tarname="tar-1.23-1-msys-1.0.13-doc.tar.lzma" />
       </component>
+
       <component class="lic">
-        <release tarname="tar-1.22-1-msys-1.0.11-lic.tar.lzma" />
         <release tarname="tar-1.23-1-msys-1.0.13-lic.tar.lzma" />
       </component>
-      <licence tarname="tar-%-msys-%-lic.tar" />
-      <source tarname="tar-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-xz.xml b/msys/msys-xz.xml
index b0b38a6..c63cce7 100644 (file)
--- a/msys/msys-xz.xml
+++ b/msys/msys-xz.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-xz.xml -->
+
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
     <package name="msys-xz">
       <affiliate group="MSYS Base System" />
       <description lang="en" title="xz (msys): High performance compression based on the LZMA algorithm" >
@@ -24,33 +28,40 @@
           prerequisites for the native (mingw32) basic-bsdtar utility.
         </paragraph>
       </description>
+
+      <source tarname="xz-%-msys-%-src.tar" />
+      <licence tarname="xz-%-msys-%-lic.tar" />
+
       <component class="bin">
-        <release tarname="xz-4.999.9beta-1-msys-1.0.11-bin.tar.gz" />
-        <release tarname="xz-4.999.9beta_20091209-1-msys-1.0.12-bin.tar.gz" />
         <release tarname="xz-4.999.9beta_20100401-1-msys-1.0.13-bin.tar.gz" >
           <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
         </release>
-        <requires eq="msys-core-*-msys-*-bin.tar" />
+
+        <!-- Every MSYS package requires msys-core-bin; this dependency
+          is implicitly satisfied, as a prerequisite of the matching DLL
+          for this package itself.
+          -->
         <requires eq="msys-liblzma-%-msys-%-dll-1.tar" />
-        <requires eq="msys-coreutils-*-msys-*-bin.tar" />
+
+        <!-- Other requirements support the auxiliary scripts, which are
+          provided by the xz-bin package.
+          -->
         <requires eq="msys-bash-*-msys-*-bin.tar" />
+        <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-diffutils-*-msys-*-bin.tar" />
         <requires eq="msys-grep-*-msys-*-bin.tar" />
         <requires eq="msys-less-*-msys-*-bin.tar" />
       </component>
+
       <component class="doc">
-        <release tarname="xz-4.999.9beta-1-msys-1.0.11-doc.tar.gz" />
-        <release tarname="xz-4.999.9beta_20091209-1-msys-1.0.12-doc.tar.gz" />
         <release tarname="xz-4.999.9beta_20100401-1-msys-1.0.13-doc.tar.gz" />
       </component>
+
       <component class="lic">
-        <release tarname="xz-4.999.9beta-1-msys-1.0.11-lic.tar.gz" />
-        <release tarname="xz-4.999.9beta_20091209-1-msys-1.0.12-lic.tar.gz" />
         <release tarname="xz-4.999.9beta_20100401-1-msys-1.0.13-lic.tar.gz" />
       </component>
-      <licence tarname="xz-%-msys-%-lic.tar" />
-      <source tarname="xz-%-msys-%-src.tar" />
     </package>
+
     <package name="msys-liblzma">
       <description lang="en" title="liblzma (msys): High performance compression library based on the LZMA algorithm" >
         <paragraph>LZMA is data compression algorithm based on the
@@ -72,22 +83,23 @@
           prerequisites for the native (mingw32) basic-bsdtar utility.
         </paragraph>
       </description>
+
+      <source tarname="xz-%-msys-%-src.tar" />
+      <licence tarname="xz-%-msys-%-lic.tar" />
+
       <component class="dll">
-        <release tarname="liblzma-4.999.9beta-1-msys-1.0.11-dll-1.tar.gz" />
-        <release tarname="liblzma-4.999.9beta_20091209-1-msys-1.0.12-dll-1.tar.gz" />
         <release tarname="liblzma-4.999.9beta_20100401-1-msys-1.0.13-dll-1.tar.gz" />
+
+        <!-- Every MSYS DLL package requires msys-core-bin -->
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
+
       <component class="dev">
-        <release tarname="liblzma-4.999.9beta-1-msys-1.0.11-dev.tar.gz" />
-        <release tarname="liblzma-4.999.9beta_20091209-1-msys-1.0.12-dev.tar.gz" />
         <release tarname="liblzma-4.999.9beta_20100401-1-msys-1.0.13-dev.tar.gz" />
         <requires eq="msys-liblzma-%-msys-%-dll-1.tar" />
       </component>
-      <licence tarname="xz-%-msys-%-lic.tar" />
-      <source tarname="xz-%-msys-%-src.tar" />
     </package>
+
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab tw=80 ts=2 sw=2 ff=unix: -->
-
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->