Fix MinGW-Bug [#2216]: error in gettext-0.18.3.2 packaging.

diff --git a/ChangeLog b/ChangeLog
index be1fe58..dfd3439 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-09-06  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Fix MinGW-Bug [#2216]: error in gettext-0.18.3.2 packaging.
+
+       * mingw32-gettext.xml (all package components): Add new release
+       specifications, at version 0.18.3.2-2; these effectlively duplicate
+       the version 0.18.3.2-1 package set, but with all offending *.la files
+       removed from the archive corresponding to the gettext-dev component.
+       * common/issue.log mingw32/issue.log: Update accordingly.
+
 2015-08-22  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Upgrade GNU MPC package set to version 1.0.2

diff --git a/common/issue.log b/common/issue.log
index 0a928ba..e112ff0 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 2015082002 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2015090600 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index 4b5f7ba..3978fc4 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -38,7 +38,7 @@
   db58df47f1a7040488cac4bd0fc6dfab758035e7 2014082600 mingw32-gcc4.xml
   21031079d59268339bfd7c6dc8239df214588bca 2013091501 mingw32-gdb.xml
   14dd10ab97b27430bdb688f4e85993cd821f7a05 2012073100 mingw32-gendef.xml
-  1f3543e9db268270f03ee13db26e558be896a45c 2014043000 mingw32-gettext.xml
+  7b16c690a8b02106e7cc7abc6c6310fe30390683 2015090600 mingw32-gettext.xml
   8272b6fc44a3e7766adec484742f007f28a39eaf 2013090900 mingw32-gmp.xml
   99e3ac0d2c743b0d927a4d89a3153a975d2bdf87 2012073100 mingw32-libarchive.xml
   e8392e268250e1bc37bc008e34c4c180cec4fdaa 2014042900 mingw32-libiconv.xml
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   8d3a7125499a85916b53efb4c897ac907e2490ab 2015082000 mingw32-mpc.xml
   8a11de23e7a89fd11436bdf162ef90712f30101b 2013102300 mingw32-mpfr.xml
-  1413ad59660ad963082e7de10c31bbb725116aee 2015082001 mingw32-package-list.xml
+  1413ad59660ad963082e7de10c31bbb725116aee 2015090600 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   0a5d210a13d073104fb74b4f9c081674c9745cd1 2013090900 mingw32-pthreads-w32.xml

diff --git a/mingw32/mingw32-gettext.xml b/mingw32/mingw32-gettext.xml
index 058c6e8..ce4adac 100644 (file)
--- a/mingw32/mingw32-gettext.xml
+++ b/mingw32/mingw32-gettext.xml
@@ -38,6 +38,7 @@
       <source tarname="gettext-%-mingw32-%-src.tar.%" />
 
       <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>
@@ -61,6 +62,9 @@
             bogus inter-package dependencies ceases to be a concern.
           </paragraph>
         </description>
+        <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>
@@ -71,6 +75,7 @@
       </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" />
@@ -78,6 +83,7 @@
       </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" />
@@ -85,16 +91,22 @@
       </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">
+        <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" />
@@ -103,6 +115,7 @@
       </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" />
@@ -119,6 +132,7 @@
       </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" />
@@ -165,6 +179,7 @@
         <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>
+        <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>
@@ -211,6 +226,7 @@
         <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>
@@ -256,6 +272,7 @@
         <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>