From bf7cc97e275a0aaad48e4fc679c11be746793dd2 Mon Sep 17 00:00:00 2001
From: Charles Wilson <cwilso11@users.sourceforge.net>
Date: Sat, 21 Aug 2010 01:36:40 +0000
Subject: [PATCH] Correct a few typos in various manifests

---
 ChangeLog                      | 27 +++++++++++++++++++++++++++
 mingw32/mingw32-autoconf.xml   |  4 ----
 mingw32/mingw32-automake.xml   |  3 ---
 mingw32/mingw32-libarchive.xml | 20 ++++++++++----------
 mingw32/mingw32-popt.xml       |  2 +-
 mingw32/mingw32-xz.xml         | 16 ++++++++--------
 msys/msys-gdbm.xml             |  2 +-
 msys/msys-guile.xml            | 30 ++++++++++++------------------
 8 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a0c732..3f5d2e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2010-08-20  Charles Wilson  <mingw@cwilson.fastmail.fm>
+
+	Correct a few typos in various manifests.
+
+	* msys/msys-gdbm.xml: Correct package name for msys-libgdbm.
+
+	* msys/msys-guile.xml: Remove references to old versions. Use
+	correct name for DLL's msys-libguile-rtm requirement. Move versioned
+	DLL requirements inside release entity.
+
+	* mingw32/mingw32-autoconf.xml: Remove non-existant wrapper -doc
+	package.
+
+	* mingw32/mingw32-automake.xml: Remove non-existant wrapper -doc
+	package.
+
+	* mingw32/mingw32-libarchive.xml: Use correct compression extension
+	for packages. Use correct package name for requirements (zlib and
+	bzip2 -dev and -dll packages).
+
+	* mingw32/mingw32-popt.xml (msys-libpopt-dll): Invalid dependency on...
+	(mingw32-libintl-%-mingw32-%-dll-8.tar): ...this; it should have been on...
+	(mingw32-libintl-*-mingw32-*-dll-8.tar): ...this; corrected.
+
+	* mingw32/mingw32-xz.xml: Use correct package name for -dll and -dev
+	packages (was xz-; should be liblzma-).
+
 2010-08-10  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
 	Add free-standing msys-expat, msys-m4, msys-patch and msys-vim.
diff --git a/mingw32/mingw32-autoconf.xml b/mingw32/mingw32-autoconf.xml
index fb80b54..9ee6d2f 100644
--- a/mingw32/mingw32-autoconf.xml
+++ b/mingw32/mingw32-autoconf.xml
@@ -26,10 +26,6 @@
         <requires eq="mingw32-autoconf2.1-*-mingw32-*-bin.tar" />
         <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
-      <component class="doc">
-        <release tarname="autoconf-6-1-mingw32-doc.tar.lzma" />
-        <release tarname="autoconf-7-1-mingw32-doc.tar.lzma" />
-      </component>
       <component class="lic">
         <release tarname="autoconf-6-1-mingw32-lic.tar.lzma" />
         <release tarname="autoconf-7-1-mingw32-lic.tar.lzma" />
diff --git a/mingw32/mingw32-automake.xml b/mingw32/mingw32-automake.xml
index 5db0a4a..817747b 100644
--- a/mingw32/mingw32-automake.xml
+++ b/mingw32/mingw32-automake.xml
@@ -27,9 +27,6 @@
         <requires eq="mingw32-automake1.10-*-mingw32-*-bin.tar" />
         <requires eq="mingw32-automake1.11-*-mingw32-*-bin.tar" />
       </component>
-      <component class="doc">
-        <release tarname="automake-4-1-mingw32-doc.tar.lzma" />
-      </component>
       <component class="lic">
         <release tarname="automake-4-1-mingw32-lic.tar.lzma" />
       </component>
diff --git a/mingw32/mingw32-libarchive.xml b/mingw32/mingw32-libarchive.xml
index 81f395a..1565e43 100644
--- a/mingw32/mingw32-libarchive.xml
+++ b/mingw32/mingw32-libarchive.xml
@@ -33,25 +33,25 @@
         </paragraph>
       </description>
       <component class="doc">
-        <release tarname="libarchive-2.8.3-1-mingw32-doc.tar.lzma" />
+        <release tarname="libarchive-2.8.3-1-mingw32-doc.tar.bz2" />
       </component>
       <component class="lic">
-        <release tarname="libarchive-2.8.3-1-mingw32-lic.tar.lzma" />
+        <release tarname="libarchive-2.8.3-1-mingw32-lic.tar.bz2" />
       </component>
       <component class="dev">
-        <release tarname="libarchive-2.8.3-1-mingw32-dev.tar.lzma" />
+        <release tarname="libarchive-2.8.3-1-mingw32-dev.tar.bz2" />
         <requires eq="mingw32-libarchive-%-mingw32-%-dll-2.tar" />
         <requires eq="mingw32-libexpat-*-mingw32-*-dev.tar" />
         <requires eq="mingw32-liblzma-*-mingw32-*-dev.tar" />
-        <requires eq="mingw32-libbz2-*-mingw32-*-dev.tar" />
-        <requires eq="mingw32-zlib-*-mingw32-*-dev.tar" />
+        <requires eq="mingw32-bzip2-*-mingw32-*-dev.tar" />
+        <requires eq="mingw32-libz-*-mingw32-*-dev.tar" />
       </component>
       <component class="dll">
-        <release tarname="libarchive-2.8.3-1-mingw32-dll-2.tar.lzma" />
+        <release tarname="libarchive-2.8.3-1-mingw32-dll-2.tar.bz2" />
         <requires eq="mingw32-libexpat-*-mingw32-*-dll-1.tar" />
         <requires eq="mingw32-liblzma-*-mingw32-*-dll-1.tar" />
-        <requires eq="mingw32-libbz2-*-mingw32-*-dll-1.tar" />
-        <requires eq="mingw32-zlib-*-mingw32-*-dll.tar" />
+        <requires eq="mingw32-libbz2-*-mingw32-*-dll-2.tar" />
+        <requires eq="mingw32-libz-*-mingw32-*-dll.tar" />
       </component>
       <licence tarname="libarchive-%-mingw32-%-lic.tar" />
       <source tarname="libarchive-%-mingw32-%-src.tar" />
@@ -94,7 +94,7 @@
         </paragraph>
       </description>
       <component class="bin">
-        <release tarname="bsdtar-2.8.3-1-mingw32-bin.tar.lzma" />
+        <release tarname="bsdtar-2.8.3-1-mingw32-bin.tar.bz2" />
         <requires eq="mingw32-libarchive-%-mingw32-%-dll-2.tar" />
       </component>
       <licence tarname="libarchive-%-mingw32-%-lic.tar" />
@@ -136,7 +136,7 @@
         </paragraph>
       </description>
       <component class="bin">
-        <release tarname="bsdcpio-2.8.3-1-mingw32-bin.tar.lzma" />
+        <release tarname="bsdcpio-2.8.3-1-mingw32-bin.tar.bz2" />
         <requires eq="mingw32-libarchive-%-mingw32-%-dll-2.tar" />
       </component>
       <licence tarname="libarchive-%-mingw32-%-lic.tar" />
diff --git a/mingw32/mingw32-popt.xml b/mingw32/mingw32-popt.xml
index 55f98c8..8be91ff 100644
--- a/mingw32/mingw32-popt.xml
+++ b/mingw32/mingw32-popt.xml
@@ -39,7 +39,7 @@
       </description>
       <component class="dll">
         <release tarname="libpopt-1.15-1-mingw32-dll-0.tar.lzma" />
-        <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
+        <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
       </component>
       <component class="dev">
         <release tarname="libpopt-1.15-1-mingw32-dev.tar.lzma" />
diff --git a/mingw32/mingw32-xz.xml b/mingw32/mingw32-xz.xml
index 6a805ed..0e48e32 100644
--- a/mingw32/mingw32-xz.xml
+++ b/mingw32/mingw32-xz.xml
@@ -77,16 +77,16 @@
         </paragraph>
       </description>
       <component class="dll">
-        <release tarname="xz-4.999.8beta_20090725git-1-mingw32-dll-1.tar.bz2" />
-        <release tarname="xz-4.999.9beta-1-mingw32-dll-1.tar.bz2" />
-        <release tarname="xz-4.999.9beta_20091209-3-mingw32-dll-1.tar.bz2" />
-        <release tarname="xz-4.999.9beta_20100401-1-mingw32-dll-1.tar.bz2" />
+        <release tarname="liblzma-4.999.8beta_20090725git-1-mingw32-dll-1.tar.bz2" />
+        <release tarname="liblzma-4.999.9beta-1-mingw32-dll-1.tar.bz2" />
+        <release tarname="liblzma-4.999.9beta_20091209-3-mingw32-dll-1.tar.bz2" />
+        <release tarname="liblzma-4.999.9beta_20100401-1-mingw32-dll-1.tar.bz2" />
       </component>
       <component class="dev">
-        <release tarname="xz-4.999.8beta_20090725git-1-mingw32-dev.tar.bz2" />
-        <release tarname="xz-4.999.9beta-1-mingw32-dev.tar.bz2" />
-        <release tarname="xz-4.999.9beta_20091209-3-mingw32-dev.tar.bz2" />
-        <release tarname="xz-4.999.9beta_20100401-1-mingw32-dev.tar.bz2" />
+        <release tarname="liblzma-4.999.8beta_20090725git-1-mingw32-dev.tar.bz2" />
+        <release tarname="liblzma-4.999.9beta-1-mingw32-dev.tar.bz2" />
+        <release tarname="liblzma-4.999.9beta_20091209-3-mingw32-dev.tar.bz2" />
+        <release tarname="liblzma-4.999.9beta_20100401-1-mingw32-dev.tar.bz2" />
         <requires eq="mingw32-liblzma-%-mingw32-%-dll-1.tar" />
       </component>
       <licence tarname="xz-%-mingw32-%-lic.tar" />
diff --git a/msys/msys-gdbm.xml b/msys/msys-gdbm.xml
index 3f89043..3f765de 100644
--- a/msys/msys-gdbm.xml
+++ b/msys/msys-gdbm.xml
@@ -33,7 +33,7 @@
       <licence tarname="gdbm-%-msys-%-lic.tar" />
       <source tarname="gdbm-%-msys-%-src.tar" />
     </package>
-    <package name="msys-libcrypt">
+    <package name="msys-libgdbm">
       <description lang="en" title="libgdbm: runtime library for the GNU Database System">
         <paragraph>The GNU Database System is a set of database routines
           that use extensible hashing. It works similar to the standard
diff --git a/msys/msys-guile.xml b/msys/msys-guile.xml
index 57d8652..5474407 100644
--- a/msys/msys-guile.xml
+++ b/msys/msys-guile.xml
@@ -26,9 +26,9 @@
         </paragraph>
       </description>
       <component class="bin">
-        <release tarname="guile-1.8.7-1-msys-1.0.11-bin.tar.lzma" />
-        <release tarname="guile-1.8.7-2-msys-1.0.15-bin.tar.lzma" />
-        <requires eq="msys-libguile-%-msys-%-dll-17.tar" />
+        <release tarname="guile-1.8.7-2-msys-1.0.15-bin.tar.lzma" >
+          <requires eq="msys-libguile-%-msys-%-dll-17.tar" />
+        </release>
         <requires eq="msys-bash-*-msys-*-bin.tar" />
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-grep-*-msys-*-bin.tar" />
@@ -36,11 +36,9 @@
         <requires eq="msys-sed-*-msys-*-bin.tar" />
       </component>
       <component class="doc">
-        <release tarname="guile-1.8.7-1-msys-1.0.11-doc.tar.lzma" />
         <release tarname="guile-1.8.7-2-msys-1.0.15-doc.tar.lzma" />
       </component>
       <component class="lic">
-        <release tarname="guile-1.8.7-1-msys-1.0.11-lic.tar.lzma" />
         <release tarname="guile-1.8.7-2-msys-1.0.15-lic.tar.lzma" />
       </component>
       <licence tarname="guile-%-msys-%-lic.tar" />
@@ -69,23 +67,20 @@
         </paragraph>
       </description>
       <component class="dll">
-        <release tarname="libguile-1.8.7-1-msys-1.0.11-dll-17.tar.lzma" >
-          <requires eq="msys-libgmp-*-msys-*-dll-3.tar" />
-        </release>
+        <requires eq="msys-core-*-msys-*-bin.tar" />
+        <requires eq="msys-libguile-%-msys-%-rtm.tar" />
         <release tarname="libguile-1.8.7-2-msys-1.0.15-dll-17.tar.lzma" >
           <requires eq="msys-libgmp-*-msys-*-dll-10.tar" />
           <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
+          <requires eq="msys-libcrypt-*-msys-*-dll-0.tar" />
+          <requires eq="msys-libltdl-*-msys-*-dll-7.tar" />
+          <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
         </release>
-        <requires eq="msys-guile-%-msys-%-rtm.tar" />
-        <requires eq="msys-core-*-msys-*-bin.tar" />
-        <requires eq="msys-libcrypt-*-msys-*-dll-0.tar" />
-        <requires eq="msys-libltdl-*-msys-*-dll-7.tar" />
-        <requires eq="msys-libregex-*-msys-*-dll-1.tar" />
       </component>
       <component class="dev">
-        <release tarname="libguile-1.8.7-1-msys-1.0.11-dev.tar.lzma" />
-        <release tarname="libguile-1.8.7-2-msys-1.0.15-dev.tar.lzma" />
-        <requires eq="msys-libguile-%-msys-%-dll-17.tar" />
+        <release tarname="libguile-1.8.7-2-msys-1.0.15-dev.tar.lzma" >
+          <requires eq="msys-libguile-%-msys-%-dll-17.tar" />
+        </release>
         <requires eq="msys-libcrypt-*-msys-*-dev.tar" />
         <requires eq="msys-libgmp-*-msys-*-dev.tar" />
         <requires eq="msys-gettext-*-msys-*-dev.tar" />
@@ -93,8 +88,7 @@
         <requires eq="msys-libregex-*-msys-*-dev.tar" />
       </component>
       <component class="rtm">
-        <release tarname="libguile-1.8.7-1-msys-1.0.11-rtm.tar.lzma" />
-        <release tarname="libguile-1.8.7-1-msys-1.0.11-rtm.tar.lzma" />
+        <release tarname="libguile-1.8.7-2-msys-1.0.15-rtm.tar.lzma" />
       </component>
       <licence tarname="guile-%-msys-%-lic.tar" />
       <source tarname="guile-%-msys-%-src.tar" />
-- 
2.11.0