Redirect libiconv package download requests to OSDN.net

diff --git a/ChangeLog b/ChangeLog
index 0193786..27cccd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+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
+       (affiliate): Associate all packages with "MinGW Standard Libraries".
+       (libiconv-bin, libiconv-dev, libiconv-dll-2, libcharset-dll-1)
+       (libiconv-lic, libiconv-html, libiconv-lang, libiconv-man): Add
+       version 1.14-2 release references.  Prune all other references; the
+       associated packages will remain on SourceForge.net, but they are not
+       scheduled for relocation to, and will not be accessible on OSDN.net
+       (libiconv-doc): Likewise; vacate content; add description; note that
+       this component package is redundant, and no longer maintained.
+       * common/issue.log mingw32/issue.log: Update accordingly.
+
 2018-12-27  Keith Marshall  <keith@users.osdn.me>
 
        Redirect binutils package download requests to OSDN.net

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

diff --git a/mingw32/issue.log b/mingw32/issue.log
index fb2e498..4fa325b 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -42,7 +42,7 @@
   b388fc17f88ee5c8726142c80deeaa393d5cbf65 2017090800 mingw32-gmp.xml
   a8d68c6dfdea77d8a2a7fb899004955f51a5dbe1 2017071400 mingw32-isl.xml
   99e3ac0d2c743b0d927a4d89a3153a975d2bdf87 2012073100 mingw32-libarchive.xml
-  e8392e268250e1bc37bc008e34c4c180cec4fdaa 2014042900 mingw32-libiconv.xml
+  1c2147cc2b8175f077f78acee8cbee11cfb03dab 2018122800 mingw32-libiconv.xml
   ccc15973cdc9ff14c12e4385c3e692af1c18b29d 2012073100 mingw32-libtool.xml
   abf16c6e3575585f92c4a88b7be2c1bf6f7e5f26 2012021600 mingw32-lua.xml
   ad4dbe74ea803c6e1e60aae92768cf62655fb77d 2012090201 mingw32-make.xml
@@ -51,7 +51,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   6f1bec812a6376338cdb16f11929eb5e866a3fba 2017071600 mingw32-mpc.xml
   671658adeceafd003aa2d1fd7a6c0177d01316e3 2018011700 mingw32-mpfr.xml
-  5c9570cce1ddd4fe275b83acbc06739a4361c26a 2018122700 mingw32-package-list.xml
+  5c9570cce1ddd4fe275b83acbc06739a4361c26a 2018122800 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-libiconv.xml b/mingw32/mingw32-libiconv.xml
index f08c16c..a119d38 100644 (file)
--- a/mingw32/mingw32-libiconv.xml
+++ b/mingw32/mingw32-libiconv.xml
@@ -4,9 +4,11 @@
   <!-- File: mingw32-libiconv.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-libiconv" alias="libiconv">
       <affiliate group="MinGW Autotools" />
+      <affiliate group="MinGW Standard Libraries" />
       <description lang="en" title="GNU libraries and utilities for character set conversion" >
         <paragraph>GNU libiconv provides an implementation of the iconv()
           function which is used to convert between various character
@@ -24,58 +26,62 @@
       <source tarname="libiconv-%-mingw32-%-src.tar.%" />
 
       <component class="bin">
-        <release tarname="libiconv-1.14-3-mingw32-bin.tar.lzma" />
-        <release tarname="libiconv-1.14-2-mingw32-bin.tar.lzma" />
-        <release tarname="libiconv-1.13.1-1-mingw32-bin.tar.lzma" />
         <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
         <requires ge="mingw32-libintl-0.18.1.1-2-mingw32-*-dll-8.tar" />
         <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
+
+        <release tarname="libiconv-1.14-4-mingw32-bin.tar.xz" />
       </component>
 
       <component class="doc">
-        <release tarname="libiconv-1.14-3-mingw32-doc.tar.lzma" />
-        <release tarname="libiconv-1.14-2-mingw32-doc.tar.lzma" />
-        <release tarname="libiconv-1.13.1-1-mingw32-doc.tar.lzma" />
+        <description lang="en">
+          <paragraph>This "doc" component package has never actually provided
+            documentation; effectively, it has always provided a rather useless
+            subset the source package content!  From the libiconv-1.14-4 release
+            onward this component package has been withdrawn; it now provides no
+            content, and may safely be removed.
+          </paragraph>
+          <paragraph>Actual documentation may be found in the "man" and "html"
+            component packages; if you require the content originally provided
+            in the "doc" component package, please download the source package.
+          </paragraph>
+        </description>
+        <release tarname="libiconv-1.14-4-mingw32-doc.tar.meta">
+          <download tarname="none" />
+        </release>
       </component>
 
       <component class="lic">
-        <release tarname="libiconv-1.14-3-mingw32-lic.tar.lzma" />
-        <release tarname="libiconv-1.14-2-mingw32-lic.tar.lzma" />
-        <release tarname="libiconv-1.13.1-1-mingw32-lic.tar.lzma" />
+        <release tarname="libiconv-1.14-4-mingw32-lic.tar.xz" />
       </component>
 
       <component class="dev">
-        <release tarname="libiconv-1.14-3-mingw32-dev.tar.lzma" />
-        <release tarname="libiconv-1.14-2-mingw32-dev.tar.lzma" />
-        <release tarname="libiconv-1.13.1-1-mingw32-dev.tar.lzma" />
+        <release tarname="libiconv-1.14-4-mingw32-dev.tar.xz" />
         <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
       </component>
 
       <component class="dll">
-        <release tarname="libiconv-1.14-3-mingw32-dll-2.tar" >
-          <download tarname="libiconv-1.14-3-mingw32-dll.tar.lzma" />
-        </release>
-        <release tarname="libiconv-1.14-2-mingw32-dll-2.tar.lzma" />
-        <release tarname="libiconv-1.13.1-1-mingw32-dll-2.tar.lzma" />
+        <release tarname="libiconv-1.14-4-mingw32-dll-2.tar.xz" />
         <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
       </component>
 
       <component class="html">
-        <release tarname="libiconv-1.14-3-mingw32-html.tar.lzma" />
+        <release tarname="libiconv-1.14-4-mingw32-html.tar.xz" />
       </component>
 
       <component class="man">
-        <release tarname="libiconv-1.14-3-mingw32-man.tar.lzma" />
+        <release tarname="libiconv-1.14-4-mingw32-man.tar.xz" />
       </component>
 
       <component class="lang">
-        <release tarname="libiconv-1.14-3-mingw32-lang.tar.lzma" />
+        <release tarname="libiconv-1.14-4-mingw32-lang.tar.xz" />
       </component>
 
     </package>
 
     <package name="mingw32-libcharset" alias="libcharset">
       <affiliate group="MinGW Autotools" />
+      <affiliate group="MinGW Standard Libraries" />
       <description lang="en" title="GNU libraries and utilities for character set conversion" >
         <paragraph>GNU libiconv provides an implementation of the iconv()
           function which is used to convert between various character
@@ -94,14 +100,12 @@
 
       <component class="dll">
         <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-        <release tarname="libcharset-1.13.1-1-mingw32-dll-1.tar.lzma" />
-        <release tarname="libcharset-1.14-2-mingw32-dll-1.tar.lzma" />
-        <release tarname="libcharset-1.14-3-mingw32-dll-1.tar" >
-          <download tarname="libiconv-1.14-3-mingw32-dll.tar.lzma" />
-        </release>
+        <release tarname="libcharset-1.14-4-mingw32-dll-1.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: -->