Update and publish msys-gettext, msys-libiconv.

Correct versioning issue with mingw32-{gettext,libiconv}.

diff --git a/ChangeLog b/ChangeLog
index 342d62a..e821311 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-31  Charles Wilson  <mingw@cwilson.fastmail.fm>
+
+       Update and publish msys-gettext, msys-libiconv.
+       Correct versioning issue with mingw32-{gettext,libiconv}.
+
+       * msys/msys-gettext.xml: Update to 0.18.1.1-1.
+       * msys/msys-libiconv.xml: Update to 1.14-1.
+       * msys/issue.log: Updated accordingly.
+       * mingw32/mingw32-gettext.xml: Version 0.18.1.1-2 requires
+       at least version 1.14-2 of mingw32-libiconv-dll-2.
+       * mingw32/mingw32-libiconv.xml: VErsion 1.14-2 requires at
+       least version 0.18.1.1-2 of mingw32-libintl-dll-8.
+       * mingw32/issue.log: Updated accordingly.
+
 2011-10-24  Charles Wilson  <mingw@cwilson.fastmail.fm>
 
        Update & publish msys-autoconf.

diff --git a/mingw32/issue.log b/mingw32/issue.log
index f319194..b9630d3 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -37,10 +37,10 @@
   8bb891214b354f906db82e4b5bf72c6d655562f2 2011091500 mingw32-gcc4.xml
   45978fa489e407f1d15c10b7cdf3e2b62d561ee8 2011102200 mingw32-gdb.xml
   8ba336812b4016c512a3e7239a0948a3a494b6f4 2011101100 mingw32-gendef.xml
-  8f27f180683c6e266727353b6f7fb425dcc10870 2011102301 mingw32-gettext.xml
+  52d885ebb7542dd7039099b66ef9aa741521cfbd 2011103101 mingw32-gettext.xml
   753225ffa6c00882b8e5aaf0c1be392e75dad30d 2010083100 mingw32-gmp.xml
   0fc48f3538d5fcc3f1e0f74618eba805bc293e8b 2011101100 mingw32-libarchive.xml
-  804dcbda6f0e8562f18cbe95ef458f8d319d3b59 2011102300 mingw32-libiconv.xml
+  6dcfb028214d55e8bb9e5c3497568e1151040cd3 2011103100 mingw32-libiconv.xml
   9fb60f097832c4b192a13f6c524fe8020f2326e5 2011101100 mingw32-libtool.xml
   aaa310c7d830e7e9eef6738273630dda8e70d674 2011101100 mingw32-make.xml
   54c581f4c27ebe5a53aa1f358899d2c59b6f750a 2011101100 mingw32-mgwport.xml

diff --git a/mingw32/mingw32-gettext.xml b/mingw32/mingw32-gettext.xml
index 1570691..f324044 100644 (file)
--- a/mingw32/mingw32-gettext.xml
+++ b/mingw32/mingw32-gettext.xml
@@ -45,7 +45,7 @@
         </release>
         <release tarname="gettext-0.18.1.1-2-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
+          <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
           <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
         </release>
       </component>
@@ -70,7 +70,7 @@
         <release tarname="gettext-0.18.1.1-2-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 ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
           <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
         </release>
       </component>
@@ -119,7 +119,7 @@
         </release>
         <release tarname="libintl-0.18.1.1-2-mingw32-dll-8.tar.lzma" >
           <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
+          <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
         </release>
       </component>
     </package>
@@ -165,7 +165,7 @@
         </release>
         <release tarname="libgettextpo-0.18.1.1-2-mingw32-dll-0.tar.lzma" >
           <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
+          <requires ge="mingw32-libiconv-1.14-2-mingw32-*-dll-2.tar" />
           <requires eq="mingw32-libintl-%-mingw32-%-dll-8.tar" />
         </release>
       </component>

diff --git a/mingw32/mingw32-libiconv.xml b/mingw32/mingw32-libiconv.xml
index d77147b..99aafbf 100644 (file)
--- a/mingw32/mingw32-libiconv.xml
+++ b/mingw32/mingw32-libiconv.xml
@@ -31,7 +31,7 @@
         </release>
         <release tarname="libiconv-1.14-2-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
-          <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
+          <requires ge="mingw32-libintl-0.18.1.1-2-mingw32-*-dll-8.tar" />
           <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
         </release>
       </component>

diff --git a/msys/issue.log b/msys/issue.log
index 9716425..43152e6 100644 (file)
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -48,7 +48,7 @@
   f784a400eca21f32292702c858645100287af663 2011101100 msys-gawk.xml
   567a81647f6705107b69c8e708e2197bf39192c2 2010090600 msys-gcc.xml
   bbfe733646846d4e1b074528c59640a7320f5ac7 2011101100 msys-gdbm.xml
-  a0fe44b5c28a062949bd442fbe48383267d456e7 2011101100 msys-gettext.xml
+  e2b49f7938d289955bb7d4e9e340ed141f1c6dac 2011103100 msys-gettext.xml
   bde079aea0e1fc6dd36ff99394d769683cccb8d5 2011101100 msys-gmp.xml
   35190dc48f6144dbfbd1b252e633dff3753ea45c 2011101100 msys-grep.xml
   0f5643e723c5e79464ea216a0bcac001c2155f62 2011101100 msys-groff.xml
@@ -58,7 +58,7 @@
   1d9f8dd96f1db41461bd8eebb0c941cb6012bd1f 2011101100 msys-inetutils.xml
   78eb3b460cd3ad9f5328f2b8698f7387a6cac03b 2011101100 msys-less.xml
   a4bebb875aa63a510b4a760cd0f26b4cdc540ad3 2011101100 msys-libarchive.xml
-  58987560ba56f0d2ab37efc2d54fcf2b97f5c5ca 2011101100 msys-libiconv.xml
+  1a8d7720579f991a19862068e54de3a606447abd 2011103100 msys-libiconv.xml
   26e84cdddb2fd385ed8e71755076e2ef36e86e3a 2011101100 msys-libtool.xml
   3731d8eaff79758b3581056130e29067def11a22 2011101100 msys-libxml2.xml
   3c439030c767a15533c6810c0ccd7b0b5a7f2512 2011101100 msys-lndir.xml

diff --git a/msys/msys-gettext.xml b/msys/msys-gettext.xml
index 3d91294..18f457d 100644 (file)
--- a/msys/msys-gettext.xml
+++ b/msys/msys-gettext.xml
@@ -51,14 +51,20 @@
           <requires eq="msys-libintl-%-msys-*-dll-8.tar" />
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
         </release>
+        <release tarname="gettext-0.18.1.1-1-msys-1.0.17-bin.tar.lzma">
+          <requires eq="msys-libintl-%-msys-*-dll-8.tar" />
+          <requires ge="msys-libiconv-1.14-1-msys-*-dll-2.tar" />
+        </release>
       </component>
 
       <component class="doc">
         <release tarname="gettext-0.17-2-msys-1.0.13-doc.tar.lzma" />
+        <release tarname="gettext-0.18.1.1-1-msys-1.0.17-doc.tar.lzma" />
       </component>
 
       <component class="lic">
         <release tarname="gettext-0.17-2-msys-1.0.13-lic.tar.lzma" />
+        <release tarname="gettext-0.18.1.1-1-msys-1.0.17-lic.tar.lzma" />
       </component>
 
       <component class="dev">
@@ -69,10 +75,18 @@
           <requires eq="msys-libexpat-*-msys-*-dll-1.tar" />
           <requires eq="msys-libtermcap-*-msys-*-dll-0.tar.lzma" />
         </release>
+        <release tarname="gettext-0.18.1.1-1-msys-1.0.17-dev.tar.lzma">
+          <requires eq="msys-libgettextpo-%-msys-*-dll-0.tar" />
+          <requires eq="msys-libintl-%-msys-*-dll-8.tar" />
+          <requires ge="msys-libiconv-1.14-1-msys-*-dll-2.tar" />
+          <requires eq="msys-libexpat-*-msys-*-dll-1.tar" />
+          <requires eq="msys-libtermcap-*-msys-*-dll-0.tar.lzma" />
+        </release>
       </component>
 
       <component class="ext">
         <release tarname="gettext-0.17-2-msys-1.0.13-ext.tar.lzma" />
+        <release tarname="gettext-0.18.1.1-1-msys-1.0.17-ext.tar.lzma" />
       </component>
     </package>
 
@@ -122,6 +136,9 @@
           <download tarname="libintl-0.17-2-msys-dll-8.tar.lzma" />
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
         </release>
+        <release tarname="libintl-0.18.1.1-1-msys-1.0.17-dll-8.tar.lzma">
+          <requires eq="msys-libiconv-1.14-1-msys-*-dll-2.tar" />
+        </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
     </package>
@@ -176,6 +193,11 @@
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
           <requires eq="msys-libtermcap-*-msys-*-dll-0.tar.lzma" />
         </release>
+        <release tarname="libgettextpo-0.18.1.1-1-msys-1.0.17-dll-0.tar.lzma">
+          <requires eq="msys-libintl-%-msys-*-dll-8.tar" />
+          <requires ge="msys-libiconv-1.14-1-msys-*-dll-2.tar" />
+          <requires eq="msys-libtermcap-*-msys-*-dll-0.tar.lzma" />
+        </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
     </package>
@@ -227,6 +249,7 @@
         <release tarname="libasprintf-0.17-2-msys-1.0.13-dll-0.tar.lzma">
           <download tarname="libasprintf-0.17-2-msys-dll-0.tar.lzma" />
         </release>
+        <release tarname="libasprintf-0.18.1.1-1-msys-1.0.17-dll-0.tar.lzma" />
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
     </package>

diff --git a/msys/msys-libiconv.xml b/msys/msys-libiconv.xml
index cdbcb21..8fcf7dd 100644 (file)
--- a/msys/msys-libiconv.xml
+++ b/msys/msys-libiconv.xml
@@ -39,25 +39,35 @@
           <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
           <requires eq="msys-libiconv-%-msys-%-dll-2.tar" />
         </release>
+        <release tarname="libiconv-1.14-1-msys-1.0.17-bin.tar.lzma">
+          <requires ge="msys-libintl-0.18.1.1-1-msys-*-dll-8.tar" />
+          <requires eq="msys-libiconv-%-msys-%-dll-2.tar" />
+        </release>
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
 
       <component class="doc">
         <release tarname="libiconv-1.13.1-2-msys-1.0.13-doc.tar.lzma" />
+        <release tarname="libiconv-1.14-1-msys-1.0.17-doc.tar.lzma" />
       </component>
 
       <component class="lic">
         <release tarname="libiconv-1.13.1-2-msys-1.0.13-lic.tar.lzma" />
+        <release tarname="libiconv-1.14-1-msys-1.0.17-lic.tar.lzma" />
       </component>
 
       <component class="dev">
         <release tarname="libiconv-1.13.1-2-msys-1.0.13-dev.tar.lzma" >
           <requires eq="msys-libiconv-%-msys-%-dll-2.tar" />
         </release>
+        <release tarname="libiconv-1.14-1-msys-1.0.17-dev.tar.lzma" >
+          <requires eq="msys-libiconv-%-msys-%-dll-2.tar" />
+        </release>
       </component>
 
       <component class="dll">
         <release tarname="libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma" />
+        <release tarname="libiconv-1.14-1-msys-1.0.17-dll-2.tar.lzma" />
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
     </package>
@@ -92,6 +102,7 @@
 
       <component class="dll">
         <release tarname="libcharset-1.13.1-2-msys-1.0.13-dll-1.tar.lzma" />
+        <release tarname="libcharset-1.14-1-msys-1.0.17-dll-1.tar.lzma" />
         <requires eq="msys-core-*-msys-*-bin.tar" />
       </component>
     </package>