From 1097166a58c49b96986d4b299f346ae924ac60c5 Mon Sep 17 00:00:00 2001
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Date: Sun, 27 Apr 2014 22:02:16 +0100
Subject: [PATCH] Upgrade mingw32-gettext to GNU gettext-0.18.3.2

---
 ChangeLog                   |  8 +++++++
 common/issue.log            |  2 +-
 mingw32/issue.log           |  2 +-
 mingw32/mingw32-gettext.xml | 55 +++++++++++++++++++++++++++------------------
 msys/issue.log              |  2 +-
 5 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e138b0..d033dc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-27  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+	Upgrade mingw32-gettext to GNU gettext-0.18.3.2
+
+	* mingw32/mingw32-gettext.xml: Add new release specifications.
+	* mingw32/issue.log common/issue.log: Updated accordingly.
+	* msys/issue.log: Sync for package list consistency.
+
 2014-01-11  Erwin Waterlander  <waterlan@xs4all.nl>
 
 	* mingw32/mingw32-dos2unix.xml: Updated for dos2unix version 6.0.4.
diff --git a/common/issue.log b/common/issue.log
index ec347d9..3ac56b4 100644
--- 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 2014011100 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2014042701 package-list.xml
 #
 # $RCSfile$: end of file
diff --git a/mingw32/issue.log b/mingw32/issue.log
index 7814ed6..35951d5 100644
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   3b9dfae51f73761e69811f402c6374c63aeec552 2013110100 mingw32-mpc.xml
   8a11de23e7a89fd11436bdf162ef90712f30101b 2013102300 mingw32-mpfr.xml
-  1413ad59660ad963082e7de10c31bbb725116aee 2014011100 mingw32-package-list.xml
+  1413ad59660ad963082e7de10c31bbb725116aee 2014042700 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 b54af1a..48599e9 100644
--- a/mingw32/mingw32-gettext.xml
+++ b/mingw32/mingw32-gettext.xml
@@ -41,74 +41,82 @@
         <release tarname="gettext-0.18.3.1-1-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libgcc-4.8.1-*-mingw32-dll-1.tar" />
           <requires eq="mingw32-libiconv-1.14-3-mingw32-dll-2.tar" />
-          <requires eq="mingw32-libintl-%-mingw32-dll-8.tar" />
         </release>
         <release tarname="gettext-0.18.1.1-2-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
           <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
-          <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
         </release>
         <release tarname="gettext-0.17-1-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
           <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
-          <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
         </release>
+        <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
       </component>
 
       <component class="dll">
-        <release tarname="gettext-0.18.3.1-1-mingw32-dll.tar.lzma" >
-          <requires eq="mingw32-libintl-0.18.3.1-1-mingw32-dll-8.tar" />
-          <requires eq="mingw32-libgettextpo-0.18.3.1-1-mingw32-dll-0.tar" />
-          <requires eq="mingw32-libasprintf-0.18.3.1-1-mingw32-dll-0.tar" />
+        <!-- FIXME: to be removed, sooner rather than later; this
+          degenerate package should never have been created in the
+          first place!
+         -->
+        <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-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-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-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-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-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-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" >
-          <requires eq="mingw32-libstdc++-*-mingw32-*-dll-6.tar" />
-          <requires eq="mingw32-libgomp-*-mingw32-*-dll-1.tar" />
-          <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
-          <requires eq="mingw32-libexpat-*-mingw32-*-dll-1.tar" />
-          <requires eq="mingw32-libgettextpo-%-mingw32-%-dll-0.tar" />
-          <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
-          <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
-        </release>
-        <release tarname="gettext-0.17-1-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libgcc-*-mingw32-*-dll-1.tar" />
-          <requires eq="mingw32-libgettextpo-%-mingw32-%-dll-0.tar" />
-          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
-          <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
-        </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 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-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" />
@@ -154,6 +162,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-1-mingw32-dll-8.tar.xz" />
       </component>
     </package>
 
@@ -199,6 +208,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-1-mingw32-dll-0.tar.xz" />
       </component>
     </package>
 
@@ -243,6 +253,7 @@
         <release tarname="libasprintf-0.18.3.1-1-mingw32-dll-0.tar" >
           <download tarname="none"/>
         </release>
+        <release tarname="libasprintf-0.18.3.2-1-mingw32-dll-0.tar.xz" />
       </component>
     </package>
 
diff --git a/msys/issue.log b/msys/issue.log
index 20ffe91..19c48fa 100644
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -73,7 +73,7 @@
   ec0f6517ee5afb3d8f4887dd0061b558604fd3f5 2012073100 msys-mktemp.xml
   243df0057053eebc442d922dff075e09fb579805 2012073100 msys-openssh.xml
   0103c79956ba9fa128755cd93374f0fc334c7cf6 2012073100 msys-openssl.xml
-  0defc38585dbedbe010d82bdf6e4dbbae8fb1398 2014011000 msys-package-list.xml
+  0defc38585dbedbe010d82bdf6e4dbbae8fb1398 2014042700 msys-package-list.xml
   d19e1e39e5fab25a3d40acb92b98b40a60b0da90 2012073100 msys-patch.xml
   d4f194d2e95035da2b712c54053fb6ad5d45e1d9 2013101200 msys-perl.xml
   19ddf46e23e23010a440af1b423d986712c3bda7 2012073100 msys-popt.xml
-- 
2.11.0