Correct a catalogue publication anomaly.

diff --git a/ChangeLog b/ChangeLog
index 2a9e17d..1de0da3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2013-08-26  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
+       Correct a catalogue publication anomaly.
+
+       * mingw32/mingw32-zlib.xml: Correct typos.
+       (zlib-1.2.8-1.mingw32-*.tar.lzma): Such malformed file references...
+       (zlib-1.2.8-1-mingw32-*.tar.lzma): ...should have appeared thus.
+
+       * common/issue.log mingw32/issue.log: References to...
+       (package-list.xml, mingw32-package-list.xml, mingw32-zlib.xml):
+       ...these automatically updated; publish lzma compressed copies to FRS.
+
+2013-08-26  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
        Add integration hooks for mingw-get-setup.
 
        * Makefile.in Makefile.comm.in:

diff --git a/common/issue.log b/common/issue.log
index f9693e6..6656057 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 2013082501 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2013082601 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index a731e60..92d259c 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -50,13 +50,13 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   d0657d9bc4fd5fa5bae78d80f003485cfde305c3 2013082300 mingw32-mpc.xml
   9c47305797d932da02275a6894b30492440af00e 2013082300 mingw32-mpfr.xml
-  983af8ad24a6f97da867784dfeeecc6661d54d88 2013082501 mingw32-package-list.xml
+  983af8ad24a6f97da867784dfeeecc6661d54d88 2013082600 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   cdfa3ced39a5dfbe38a6f9f8c67007c80e76eb0a 2013082500 mingw32-pthreads-w32.xml
   c5e5acd7ddfbb8b412ba1ade45088d7a22433228 2013082303 mingw32-runtime.xml
   12acb32f80e49c893167cfae82e448dd766d49bb 2013070100 mingw32-wsl-candidate.xml
   247a02890f109a5fe4996fde4af9d576dca3cd1e 2012073100 mingw32-xz.xml
-  b934cbeb35035e8a85d154e5973df2a9c757576c 2013082500 mingw32-zlib.xml
+  a8ccf345561b36b3fb00e2e5767206bd65419fde 2013082600 mingw32-zlib.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/mingw32-zlib.xml b/mingw32/mingw32-zlib.xml
index d77a034..de29349 100644 (file)
--- a/mingw32/mingw32-zlib.xml
+++ b/mingw32/mingw32-zlib.xml
@@ -8,12 +8,16 @@
 
     <package name="mingw32-zlib" alias="zlib">
       <affiliate group="MinGW Standard Libraries" />
-      <description lang="en" title="A Massively Spiffy Yet Delicately Unobtrusive Compression Library (docs)">
+      <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. The mingw32-zlib package provides documentation
-          related to the ZLib library. The runtime and development files are
-          provided by the associated mingw32-libz package.
+          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>
 
@@ -21,11 +25,11 @@
       <source tarname="zlib-%-mingw32-%-src.tar.%" />
 
       <component class="dll">
-       <release tarname="zlib-1.2.8-1.mingw32-dll.tar.lzma" />
+        <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" />
+        <release tarname="zlib-1.2.8-1-mingw32-dev.tar.lzma" />
       </component>
 
       <component class="doc">
@@ -37,7 +41,7 @@
       </component>
 
       <component class="lic">
-       <release tarname="zlib-1.2.8-1-mingw32-lic.tar.lzma" />
+        <release tarname="zlib-1.2.8-1-mingw32-lic.tar.lzma" />
         <release tarname="zlib-1.2.7-1-mingw32-lic.tar.lzma" />
         <release tarname="zlib-1.2.5-4-mingw32-lic.tar.lzma" />
         <release tarname="zlib-1.2.5-1-mingw32-lic.tar.lzma" />
@@ -45,7 +49,7 @@
       </component>
 
       <component class="man">
-       <release tarname="zlib-1.2.8-1-mingw32-man.tar.lzma" />
+        <release tarname="zlib-1.2.8-1-mingw32-man.tar.lzma" />
         <release tarname="zlib-1.2.7-1-mingw32-man.tar.lzma" />
         <release tarname="zlib-1.2.5-4-mingw32-man.tar.lzma" />
         <release tarname="zlib-1.2.5-1-mingw32-man.tar.lzma" />
@@ -55,10 +59,9 @@
 
     <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>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
@@ -101,13 +104,12 @@
 
     <package name="mingw32-minizip" alias="minizip">
       <description lang="en" title="Simple ZIP support from zlib">
-        <paragraph>
-         NOTE: This program was not delivered with the zlib-1.2.8 release. This
-         decision was made due to the number of downloads for the package as
-         well as a belief that the zip and unzip packages are already minimal
-         enough.  It is therefore considered obsolete and should be removed
-         from your systems.
-       </paragraph>
+        <paragraph>NOTE: This program was not delivered with the zlib-1.2.8
+          release. This decision was made due to the number of downloads for
+          the package as well as a belief that the zip and unzip packages are
+          already minimal enough.  It is therefore considered obsolete and
+          should be removed from your systems.
+        </paragraph>
         <paragraph>The minizip package provides two simple ZIP archive
           manipulation tools, based on the minizip library from zlib.  More
           sophisticated needs are met by the unzip and zip packages.
@@ -131,13 +133,12 @@
 
     <package name="mingw32-libminizip" alias="libminizip">
       <description lang="en" title="Simple ZIP support from zlib">
-       <paragraph>
-         NOTE: This program was not delivered with the zlib-1.2.8 release. This
-         decision was made due to the number of downloads for the package as
-         well as a belief that the libarchive package is already minimal
-         enough.  It is therefore considered obsolete and should be removed
-         from your systems.
-       </paragraph>
+        <paragraph>NOTE: This program was not delivered with the zlib-1.2.8
+          release. This decision was made due to the number of downloads for the
+          package as well as a belief that the libarchive package is already
+          minimal enough.  It is therefore considered obsolete and should be
+          removed from your system.
+        </paragraph>
         <paragraph>The minizip library provides zlib-based support for
           manipulating ZIP archives. It is suitable for clients that need only
           create, inspect, and unpack such archives; more demanding needs may be