Redirect GNU gettext package download requests to OSDN.net

diff --git a/ChangeLog b/ChangeLog
index 27cccd8..2e02a95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2018-12-28  Keith Marshall  <keith@users.osdn.me>
 
+       Redirect GNU gettext package download requests to OSDN.net
+
+       * mingw32/mingw32-gettext.xml (download-host): Relocate to osdn.net
+       (affiliate) <libintl>: Associate with "MinGW Standard Libraries".
+       (affiliate) <libgettextpo, libasprintf>: Likewise.
+       (gettext-bin, gettext-ext, gettext-dev, gettext-doc, gettext-info)
+       (gettext-man, gettext-html, gettext-lic, gettext-dll, libintl-dll-8)
+       (libgettextpo-dll-0, libasprintf-dll-0): Prune release references to
+       any version other than 0.18.3.2-2; the associated packages will remain
+       on SourceForge.net, but they are not scheduled for relocation to, and
+       will not be accessible on, the OSDN.net download host.
+       [libiconv-dll-2]: Accept any issue of version 1.14
+       (gettext-dll): Update description; declare it obsolete.
+       * common/issue.log mingw32/issue.log: Update accordingly.
+
+2018-12-28  Keith Marshall  <keith@users.osdn.me>
+
        Redirect libiconv package download requests to OSDN.net
 
        * mingw32/libiconv.xml (download-host): Relocate to osdn.net

diff --git a/common/issue.log b/common/issue.log
index 76e5ad5..e66048b 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.
 #
-  c6a9068e183254c0b930ac6e1a70fd81743dc212 2018122800 package-list.xml
+  c6a9068e183254c0b930ac6e1a70fd81743dc212 2018122801 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index 4fa325b..a511cbc 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -38,7 +38,7 @@
   8e6c3971ca94ab1bbc18e23b6e26f020a16dfeb2 2017072600 mingw32-gcc4.xml
   21031079d59268339bfd7c6dc8239df214588bca 2013091501 mingw32-gdb.xml
   14dd10ab97b27430bdb688f4e85993cd821f7a05 2012073100 mingw32-gendef.xml
-  7b16c690a8b02106e7cc7abc6c6310fe30390683 2015090600 mingw32-gettext.xml
+  4646d328c5586fac8d11efa98334c0e4f9aac629 2018122800 mingw32-gettext.xml
   b388fc17f88ee5c8726142c80deeaa393d5cbf65 2017090800 mingw32-gmp.xml
   a8d68c6dfdea77d8a2a7fb899004955f51a5dbe1 2017071400 mingw32-isl.xml
   99e3ac0d2c743b0d927a4d89a3153a975d2bdf87 2012073100 mingw32-libarchive.xml
@@ -51,7 +51,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   6f1bec812a6376338cdb16f11929eb5e866a3fba 2017071600 mingw32-mpc.xml
   671658adeceafd003aa2d1fd7a6c0177d01316e3 2018011700 mingw32-mpfr.xml
-  5c9570cce1ddd4fe275b83acbc06739a4361c26a 2018122800 mingw32-package-list.xml
+  5c9570cce1ddd4fe275b83acbc06739a4361c26a 2018122801 mingw32-package-list.xml
   1f15439ee5f66ec22321c7aa853559b6f8f7172f 2015090800 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   6032af6ff68aa4821cf51938781fd9e75f05de5f 2016082200 mingw32-pthreads-w32.xml

diff --git a/mingw32/mingw32-gettext.xml b/mingw32/mingw32-gettext.xml
index ce4adac..eff5158 100644 (file)
--- a/mingw32/mingw32-gettext.xml
+++ b/mingw32/mingw32-gettext.xml
@@ -4,9 +4,10 @@
   <!-- File: mingw32-gettext.xml -->
 
   <package-collection subsystem="mingw32">
-    <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+    <download-host uri="http://osdn.net/dl/mingw/%F" />
 
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
     <package name="mingw32-gettext" alias="gettext">
       <affiliate group="MinGW Autotools" />
       <description lang="en" title="GNU Internationalization Library and Utilities" >
@@ -39,110 +40,74 @@
 
       <component class="bin">
         <release tarname="gettext-0.18.3.2-2-mingw32-bin.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-bin.tar.xz">
-          <download tarname="gettext-0.18.3.2-1-1-mingw32-bin.tar.xz" />
-        </release>
-        <release tarname="gettext-0.18.3.1-1-mingw32-bin.tar.lzma" />
-        <release tarname="gettext-0.18.1.1-2-mingw32-bin.tar.lzma" />
-        <release tarname="gettext-0.17-1-mingw32-bin.tar.lzma" />
         <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
-        <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
+        <requires ge="mingw32-libiconv-1.14-*-mingw32-*-dll-2.tar" />
         <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
       </component>
 
       <component class="dll">
         <!-- FIXME: to be removed, sooner rather than later; this
-          degenerate package should never have been created in the
+          misnamed package should never have been created in the
           first place!
          -->
         <description lang="en">
-          <paragraph>Please DO NOT install this component package!
-            It is malformed, and WILL introduce package conflicts; it will
-            be discontinued, when the likelihood of encountering residual
-            bogus inter-package dependencies ceases to be a concern.
+          <paragraph>Please DO NOT install this component package!  It is the
+            product of faulty packaging, within an obsolete GNU gettext release.
+            It now delivers no useful content, (beyond forcing installation of
+            the correctly named libiconv-dll package as a dependency); if it has
+            been installed, PLEASE first UPGRADE, and then REMOVE IT.
           </paragraph>
         </description>
+        <requires ge="mingw32-libintl-%-mingw32-%-dll-8.tar" />
         <release tarname="gettext-0.18.3.2-2-mingw32-dll.tar.xz">
           <download tarname="none" />
         </release>
-        <release tarname="gettext-0.18.3.2-1-mingw32-dll.tar.xz">
-          <download tarname="none" />
-        </release>
-        <release tarname="gettext-0.18.3.1-1-mingw32-dll.tar.lzma" />
-        <requires eq="mingw32-libintl-%-mingw32-dll-8.tar" />
-        <requires eq="mingw32-libgettextpo-%-mingw32-dll-0.tar" />
-        <requires eq="mingw32-libasprintf-%-mingw32-dll-0.tar" />
       </component>
 
       <component class="doc">
         <release tarname="gettext-0.18.3.2-2-mingw32-doc.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-doc.tar.xz" />
-        <release tarname="gettext-0.18.3.1-1-mingw32-doc.tar.lzma" />
-        <release tarname="gettext-0.18.1.1-2-mingw32-doc.tar.lzma" />
-        <release tarname="gettext-0.17-1-mingw32-doc.tar.lzma" />
       </component>
 
       <component class="lic">
         <release tarname="gettext-0.18.3.2-2-mingw32-lic.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-lic.tar.xz" />
-        <release tarname="gettext-0.18.3.1-1-mingw32-lic.tar.lzma" />
-        <release tarname="gettext-0.18.1.1-2-mingw32-lic.tar.lzma" />
-        <release tarname="gettext-0.17-1-mingw32-lic.tar.lzma" />
       </component>
 
       <component class="info">
         <release tarname="gettext-0.18.3.2-2-mingw32-info.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-info.tar.xz" />
-        <release tarname="gettext-0.18.3.1-1-mingw32-info.tar.lzma" />
       </component>
 
       <component class="man">
         <release tarname="gettext-0.18.3.2-2-mingw32-man.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-man.tar.xz" />
-        <release tarname="gettext-0.18.3.1-1-mingw32-man.tar.lzma" />
       </component>
 
       <component class="html">
+        <requires eq="gettext-%-mingw32-%-doc.tar" />
         <release tarname="gettext-0.18.3.2-2-mingw32-html.tar.xz" >
-          <requires eq="gettext-%-mingw32-%-doc.tar" />
           <download tarname="none" />
         </release>
-        <release tarname="gettext-0.18.3.2-1-mingw32-html.tar.xz" >
-          <requires eq="gettext-%-mingw32-%-doc.tar" />
-          <download tarname="none" />
-        </release>
-        <release tarname="gettext-0.18.3.1-1-mingw32-html.tar.lzma" />
       </component>
 
       <component class="dev">
         <release tarname="gettext-0.18.3.2-2-mingw32-dev.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-dev.tar.xz" />
-        <release tarname="gettext-0.18.3.1-1-mingw32-dev.tar.lzma" >
-          <requires eq="gettext-0.18.3.1-1-mingw32-dll.tar.lzma" />
-        </release>
-        <release tarname="gettext-0.18.1.1-2-mingw32-dev.tar.lzma" />
-        <release tarname="gettext-0.17-1-mingw32-dev.tar.lzma" />
         <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
         <requires eq="mingw32-libstdc++-*-mingw32-*-dll-6.tar" />
         <requires eq="mingw32-libgomp-*-mingw32-*-dll-1.tar" />
         <requires eq="mingw32-libexpat-*-mingw32-*-dll-1.tar" />
-        <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
+        <requires ge="mingw32-libiconv-1.14-*-mingw32-*-dll-2.tar" />
         <requires eq="mingw32-libgettextpo-%-mingw32-%-dll-0.tar" />
         <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
       </component>
 
       <component class="ext">
         <release tarname="gettext-0.18.3.2-2-mingw32-ext.tar.xz" />
-        <release tarname="gettext-0.18.3.2-1-mingw32-ext.tar.xz" />
-        <release tarname="gettext-0.18.3.1-1-mingw32-ext.tar.lzma" />
-        <release tarname="gettext-0.18.1.1-2-mingw32-ext.tar.lzma" />
-        <release tarname="gettext-0.17-1-mingw32-ext.tar.lzma" />
       </component>
     </package>
 
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
     <package name="mingw32-libintl" alias="libintl">
       <affiliate group="MinGW Autotools" />
+      <affiliate group="MinGW Standard Libraries" />
       <description lang="en" title="GNU Internationalization Runtime Library" >
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual
@@ -173,20 +138,16 @@
 
       <component class="dll">
         <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
-        <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
-        <release tarname="libintl-0.17-1-mingw32-dll-8.tar.lzma" />
-        <release tarname="libintl-0.18.1.1-2-mingw32-dll-8.tar.lzma" />
-        <release tarname="libintl-0.18.3.1-1-mingw32-dll-8.tar" >
-          <download tarname="gettext-0.18.3.1-1-mingw32-dll.tar.lzma"/>
-        </release>
+        <requires ge="mingw32-libiconv-1.14-*-mingw32-*-dll-2.tar" />
         <release tarname="libintl-0.18.3.2-2-mingw32-dll-8.tar.xz" />
-        <release tarname="libintl-0.18.3.2-1-mingw32-dll-8.tar.xz" />
       </component>
     </package>
 
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
     <package name="mingw32-libgettextpo" alias="libgettextpo">
       <affiliate group="MinGW Autotools" />
+      <affiliate group="MinGW Standard Libraries" />
       <description lang="en" title="GNU Internationalization Utility Library" >
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual
@@ -219,21 +180,17 @@
 
       <component class="dll">
         <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
-        <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
+        <requires ge="mingw32-libiconv-1.14-*-mingw32-*-dll-2.tar" />
         <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
-        <release tarname="libgettextpo-0.17-1-mingw32-dll-0.tar.lzma" />
-        <release tarname="libgettextpo-0.18.1.1-2-mingw32-dll-0.tar.lzma" />
-        <release tarname="libgettextpo-0.18.3.1-1-mingw32-dll-0.tar" >
-          <download tarname="gettext-0.18.3.1-1-mingw32-dll.tar.lzma"/>
-        </release>
         <release tarname="libgettextpo-0.18.3.2-2-mingw32-dll-0.tar.xz" />
-        <release tarname="libgettextpo-0.18.3.2-1-mingw32-dll-0.tar.xz" />
       </component>
     </package>
 
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+
     <package name="mingw32-libasprintf" alias="libasprintf">
       <affiliate group="MinGW Autotools" />
+      <affiliate group="MinGW Standard Libraries" />
       <description lang="en" title="GNU Internationalization Utility Library" >
         <paragraph>GNU gettext provides a set of tools that create a
           framework to help other GNU packages produce multi-lingual
@@ -267,16 +224,12 @@
       <component class="dll">
         <requires eq="mingw32-libstdc++-*-mingw32-*-dll-6.tar" />
         <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
-        <release tarname="libasprintf-0.17-1-mingw32-dll-0.tar.lzma" />
-        <release tarname="libasprintf-0.18.1.1-2-mingw32-dll-0.tar.lzma" />
-        <release tarname="libasprintf-0.18.3.1-1-mingw32-dll-0.tar" >
-          <download tarname="none"/>
-        </release>
         <release tarname="libasprintf-0.18.3.2-2-mingw32-dll-0.tar.xz" />
-        <release tarname="libasprintf-0.18.3.2-1-mingw32-dll-0.tar.xz" />
       </component>
     </package>
 
   </package-collection>
 </software-distribution>
-<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->
+
+<!-- vim: set nocompatible expandtab showcmd tabstop=2 shiftwidth=2: -->
+<!-- vim: set fileformat=unix textwidth=80: -->