From 4c51fed0a0eb43e894ddf9e3c4bc45841d5cb4fc Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sourceforge.net>
Date: Sun, 8 Sep 2013 11:15:35 -0400
Subject: [PATCH] Finish rework for gcc and publish 4.8.1-2.

---
 ChangeLog                |   9 ++++
 common/issue.log         |   2 +-
 mingw32/issue.log        |   4 +-
 mingw32/mingw32-gcc4.xml | 104 ++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 97 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6d05e4..f200a3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-08  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	Finish rework for gcc and publish 4.8.1-2.
+
+	* mingw32/mingw32-gcc4.xml: Add 4.8.1-2 release and complete the rework
+	for the libraries.
+	* common/issue.log mingw32/issue.log: Updated accordingly.
+
 2013-09-07  Earnie Boyd  <earnie@users.sourceforge.net>
 
 	Rework my previous changes to help avoid ERROR issues.
@@ -11,6 +19,7 @@
 	* mingw32/mingw32-pthreads-w32.xml: Rework to use libpthread package
 	as before.
 	* mingw32/mingw32-zlib.zml: Rework to use libz package as before.
+	* common/issue.log mingw32/issue.log: Updated accordingly.
 
 2013-09-04  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
diff --git a/common/issue.log b/common/issue.log
index 4efa288..ca77071 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 2013090801 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2013090804 package-list.xml
 #
 # $RCSfile$: end of file
diff --git a/mingw32/issue.log b/mingw32/issue.log
index e1dd89d..ba7fba9 100644
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -35,7 +35,7 @@
   a14614e416d2a0aa7d4d0bbc1b30ab85e73d704b 2013090300 mingw32-expat.xml
   bc4b331f9bdfbf72a11a310fbc17a027396d09d5 2012073100 mingw32-gcc-tools.xml
   9d1d9deeccee4fb04f2944e3cd5e7b85757308ce 2011050500 mingw32-gcc3.xml
-  8a365a35815a40e7e81f4ec3fe6eee6482080ae7 2013090800 mingw32-gcc4.xml
+  aa57cd5a0e02d039f82522d68476f948a64115d7 2013090802 mingw32-gcc4.xml
   2aec3c75d5ccba91607e343bcc304f3baf24ae56 2012082702 mingw32-gdb.xml
   14dd10ab97b27430bdb688f4e85993cd821f7a05 2012073100 mingw32-gendef.xml
   e96f16b3e2b203b30e719f840acb0bed5a44226a 2013090300 mingw32-gettext.xml
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   d0657d9bc4fd5fa5bae78d80f003485cfde305c3 2013082300 mingw32-mpc.xml
   9c47305797d932da02275a6894b30492440af00e 2013082300 mingw32-mpfr.xml
-  983af8ad24a6f97da867784dfeeecc6661d54d88 2013090800 mingw32-package-list.xml
+  983af8ad24a6f97da867784dfeeecc6661d54d88 2013090802 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   7e22a7d22719059c28dcb37b7a48806070964b09 2013082800 mingw32-pthreads-w32.xml
diff --git a/mingw32/mingw32-gcc4.xml b/mingw32/mingw32-gcc4.xml
index 8c185fb..436fdf5 100644
--- a/mingw32/mingw32-gcc4.xml
+++ b/mingw32/mingw32-gcc4.xml
@@ -25,6 +25,7 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="lic">
+	<release tarname="gcc-core-4.8.1-2-mingw32-lic.tar.lzma" />
 	<release tarname="gcc-core-4.8.1-1-mingw32-lic.tar.lzma" />
         <release tarname="gcc-4.7.2-1-mingw32-lic.tar.lzma" />
         <release tarname="gcc-4.7.0-1-mingw32-lic.tar.lzma" />
@@ -34,6 +35,12 @@
       </component>
 
       <component class="bin">
+	<release tarname="gcc-core-4.8.1-2-mingw32-bin.tar.lzma">
+	  <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
+	  <requires eq="binutils-*-mingw32-bin.tar.lzma" />
+	  <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
+	  <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
+	</release>
 	<release tarname="gcc-core-4.8.1-1-mingw32-bin.tar.lzma">
 	  <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
 	  <requires eq="binutils-*-mingw32-bin.tar.lzma" />
@@ -97,12 +104,16 @@
       </component>
 
       <component class="dev">
+	<release tarname="gcc-core-4.8.1-2-mingw32-dev.tar.lzma">
+	  <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
+	</release>
 	<release tarname="gcc-core-4.8.1-1-mingw32-dev.tar.lzma">
 	  <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
 	</release>
       </component>
 
       <component class="doc">
+        <release tarname="gcc-core-4.8.1-2-mingw32-doc.tar.lzma" />
         <release tarname="gcc-core-4.8.1-1-mingw32-doc.tar.lzma" />
         <release tarname="gcc-4.7.2-1-mingw32-doc.tar.lzma" />
         <release tarname="gcc-4.7.0-1-mingw32-doc.tar.lzma" />
@@ -112,14 +123,17 @@
       </component>
 
       <component class="man">
+        <release tarname="gcc-core-4.8.1-2-mingw32-man.tar.lzma" />
         <release tarname="gcc-core-4.8.1-1-mingw32-man.tar.lzma" />
       </component>
 
       <component class="info">
+        <release tarname="gcc-core-4.8.1-2-mingw32-info.tar.lzma" />
         <release tarname="gcc-core-4.8.1-1-mingw32-info.tar.lzma" />
       </component>
 
       <component class="lang">
+        <release tarname="gcc-4.8.1-2-mingw32-lang.tar.lzma" />
         <release tarname="gcc-4.8.1-1-mingw32-lang.tar.lzma" />
         <release tarname="gcc-4.7.2-1-mingw32-lang.tar.lzma" />
         <release tarname="gcc-4.7.0-1-mingw32-lang.tar.lzma" />
@@ -155,6 +169,10 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+	<release tarname="libgcc-4.8.1-2-mingw32-dll-1.tar">
+	  <download tarname="gcc-core-4.8.1-2-mingw32-dll.tar.lzma"/>
+	  <requires eq="mingw32-libmpc-*-mingw32-dll-2.tar" />
+	</release>
 	<release tarname="libgcc-4.8.1-1-mingw32-dll-1.tar">
 	  <download tarname="gcc-core-4.8.1-1-mingw32-dll.tar.lzma"/>
 	  <requires eq="mingw32-libmpc-*-mingw32-dll-2.tar" />
@@ -186,6 +204,13 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="bin">
+	<release tarname="gcc-ada-4.8.1-2-mingw32-bin.tar.lzma">
+	  <requires eq="gcc-ada-%-mingw32-dev.tar.lzma" />
+	  <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
+	  <requires eq="mingwrt-4.*-mingw32-dev.tar.lzma" />
+	  <requires eq="w32api-4.*-mingw32-dev.tar.lzma" />
+	  <requires eq="binutils-*-mingw32-bin.tar.lzma" />
+	</release>
 	<release tarname="gcc-ada-4.8.1-1-mingw32-bin.tar.lzma">
 	  <requires eq="gcc-ada-%-mingw32-dev.tar.lzma" />
 	  <requires eq="gcc-core-%-mingw32-dev.tar.lzma" />
@@ -211,19 +236,17 @@
         </release>
       </component>
 
-      <component class="dll">
-	<release tarname="gcc-ada-4.8.1-1-mingw32-dll.tar.lzma" >
-	  <requires eq="libgnat-%-mingw32-dll-0.tar" />
-	</release>
-      </component>
-
       <component class="dev">
+	<release tarname="gcc-ada-4.8.1-2-mingw32-dev.tar.lzma">
+	  <requires eq="mingw32-libgnat-%-mingw32-dll.tar" />
+	</release>
 	<release tarname="gcc-ada-4.8.1-1-mingw32-dev.tar.lzma">
-	  <requires eq="gcc-ada-%-mingw32-dll.tar.lzma" />
+	  <requires eq="mingw32-libgnat-%-mingw32-dll.tar" />
 	</release>
       </component>
 
       <component class="info">
+	<release tarname="gcc-ada-4.8.1-2-mingw32-info.tar.lzma" />
 	<release tarname="gcc-ada-4.8.1-1-mingw32-info.tar.lzma" />
       </component>
     </package>
@@ -255,8 +278,11 @@
         <release tarname="libgnat-4.6.2-1-mingw32-dll-4_6.tar.lzma" />
         <release tarname="libgnat-4.7.0-1-mingw32-dll-4_7.tar.lzma" />
         <release tarname="libgnat-4.7.2-1-mingw32-dll-4_7.tar.lzma" />
-	<release tarname="libgnat-4.8.1-1-mingw32-dll-0.tar" >
-	  <download tarname="none" />
+	<release tarname="libgnat-4.8.1-2-mingw32-dll-4_8.tar" >
+	  <download tarname="gcc-ada-4.8.1-2-mingw32-dll.tar.lzma" />
+	</release>
+	<release tarname="libgnat-4.8.1-1-mingw32-dll-4_8.tar" >
+	  <download tarname="gcc-ada-4.8.1-1-mingw32-dll.tar.lzma" />
 	</release>
       </component>
     </package>
@@ -280,6 +306,9 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="bin">
+	<release tarname="gcc-c++-4.8.1-2-mingw32-bin.tar.lzma" >
+	  <requires eq="gcc-c++-4.8.1-2-mingw32-dev.tar.lzma" />
+	</release>
 	<release tarname="gcc-c++-4.8.1-1-mingw32-bin.tar.lzma" >
 	  <requires eq="gcc-c++-4.8.1-1-mingw32-dev.tar.lzma" />
 	</release>
@@ -306,16 +335,21 @@
       </component>
 
       <component class="dev">
+	<release tarname="gcc-c++-4.8.1-2-mingw32-dev.tar.lzma" >
+	  <requires eq="mingw32-libstdc++-4.8.1-2-mingw32-dll-6.tar" />
+	</release>
 	<release tarname="gcc-c++-4.8.1-1-mingw32-dev.tar.lzma" >
 	  <requires eq="mingw32-libstdc++-4.8.1-1-mingw32-dll-6.tar" />
 	</release>
       </component>
 
       <component class="doc">
+	<release tarname="gcc-c++-4.8.1-2-mingw32-doc.tar.lzma" />
 	<release tarname="gcc-c++-4.8.1-1-mingw32-doc.tar.lzma" />
       </component>
 
       <component class="man">
+	<release tarname="gcc-c++-4.8.1-2-mingw32-man.tar.lzma" />
 	<release tarname="gcc-c++-4.8.1-1-mingw32-man.tar.lzma" />
       </component>
     </package>
@@ -343,6 +377,9 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="dll">
+	<release tarname="libstdc++-4.8.1-2-mingw32-dll-6.tar" >
+	  <download tarname="gcc-c++-4.8.1-2-mingw32-dll.tar.lzma" />
+	</release>
 	<release tarname="libstdc++-4.8.1-1-mingw32-dll-6.tar" >
 	  <download tarname="gcc-c++-4.8.1-1-mingw32-dll.tar.lzma" />
 	</release>
@@ -374,6 +411,9 @@
       <licence tarname="gcc-%-mingw32-lic.tar.lzma" />
 
       <component class="bin">
+	<release tarname="gcc-fortran-4.8.1-2-mingw32-bin.tar.lzma">
+	  <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
+	</release>
 	<release tarname="gcc-fortran-4.8.1-1-mingw32-bin.tar.lzma">
 	  <requires eq="gcc-fortran-%-mingw32-dev.tar.lzma" />
 	</release>
@@ -400,20 +440,26 @@
       </component>
 
       <component class="dev">
+	<release tarname="gcc-fortran-4.8.1-2-mingw32-dev.tar.lzma" >
+	  <requires eq="libgfortran-4.8.1-2-mingw32-dll-3.tar" />
+	</release>
 	<release tarname="gcc-fortran-4.8.1-1-mingw32-dev.tar.lzma" >
 	  <requires eq="libgfortran-4.8.1-1-mingw32-dll-3.tar" />
 	</release>
       </component>
 
       <component class="doc">
+	<release tarname="gcc-fortran-4.8.1-2-mingw32-doc.tar.lzma" />
 	<release tarname="gcc-fortran-4.8.1-1-mingw32-doc.tar.lzma" />
       </component>
 
       <component class="info">
+	<release tarname="gcc-fortran-4.8.1-2-mingw32-info.tar.lzma" />
 	<release tarname="gcc-fortran-4.8.1-1-mingw32-info.tar.lzma" />
       </component>
 
       <component class="man">
+	<release tarname="gcc-fortran-4.8.1-2-mingw32-man.tar.lzma" />
 	<release tarname="gcc-fortran-4.8.1-1-mingw32-man.tar.lzma" />
       </component>
     </package>
@@ -443,6 +489,9 @@
         <release tarname="libgfortran-4.6.2-1-mingw32-dll-3.tar.lzma" />
         <release tarname="libgfortran-4.7.0-1-mingw32-dll-3.tar.lzma" />
         <release tarname="libgfortran-4.7.2-1-mingw32-dll-3.tar.lzma" />
+	<release tarname="libgfortran-4.8.1-2-mingw32-dll-3.tar" >
+	  <download tarname="gcc-fortran-4.8.1-2-mingw32-dll.tar.lzma" />
+	</release>
 	<release tarname="libgfortran-4.8.1-1-mingw32-dll-3.tar" >
 	  <download tarname="gcc-fortran-4.8.1-1-mingw32-dll.tar.lzma" />
 	</release>
@@ -517,22 +566,24 @@
 	  <requires eq="gcc-core-%-mingw32-bin.tar" />
           <requires eq="libobjc-%-mingw32-dll-2.tar" />
         </release>
+	<release tarname="gcc-objc-4.8.1-2-mingw32-bin.tar" >
+	  <download tarname="none" />
+	  <requires eq="gcc-core-4.8.1-2-mingw32-bin.tar.lzma" />
+	  <requires eq="gcc-objc-4.8.1-2-mingw32-dev.tar.lzma" />
+	</release>
 	<release tarname="gcc-objc-4.8.1-1-mingw32-bin.tar" >
 	  <download tarname="none" />
+	  <requires eq="gcc-core-4.8.1-1-mingw32-bin.tar.lzma" />
 	  <requires eq="gcc-objc-4.8.1-1-mingw32-dev.tar.lzma" />
 	</release>
       </component>
 
-      <component class="dll">
-	<release tarname="gcc-objc-4.8.1-1-mingw32-dll.tar.lzma" >
-	  <requires eq="gcc-core-%-mingw32-bin.tar.lzma" />
-	  <requires eq="libobjc-%-mingw32-dll-0.tar" />
-	</release>
-      </component>
-
       <component class="dev">
+	<release tarname="gcc-objc-4.8.1-2-mingw32-dev.tar.lzma">
+	  <requires eq="libobjc-%-mingw32-dll-4.tar" />
+	</release>
 	<release tarname="gcc-objc-4.8.1-1-mingw32-dev.tar.lzma">
-	  <requires eq="gcc-objc-%-mingw32-dll.tar.lzma" />
+	  <requires eq="libobjc-%-mingw32-dll-4.tar" />
 	</release>
       </component>
     </package>
@@ -565,8 +616,11 @@
         <release tarname="libobjc-4.6.2-1-mingw32-dll-3.tar.lzma" />
         <release tarname="libobjc-4.7.0-1-mingw32-dll-4.tar.lzma" />
         <release tarname="libobjc-4.7.2-1-mingw32-dll-4.tar.lzma" />
-	<release tarname="libobjc-4.8.1-1-mingw32-dll-0.tar" >
-	  <download tarname="none"/>
+	<release tarname="libobjc-4.8.1-2-mingw32-dll-4.tar" >
+	  <download tarname="gcc-objc-4.8.1-2-mingw32-dll.tar.lzma"/>
+	</release>
+	<release tarname="libobjc-4.8.1-1-mingw32-dll-4.tar" >
+	  <download tarname="gcc-objc-4.8.1-1-mingw32-dll.tar.lzma"/>
 	</release>
       </component>
     </package>
@@ -584,6 +638,10 @@
         <release tarname="libgomp-4.6.2-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgomp-4.7.0-1-mingw32-dll-1.tar.lzma" />
         <release tarname="libgomp-4.7.2-1-mingw32-dll-1.tar.lzma" />
+	<release tarname="libgomp-4.8.1-2-mingw32-dll-1.tar" >
+	  <download tarname="none"/>
+	  <requires eq="mingw32-libgcc-4.8.1-2-mingw32-dll-1.tar" />
+	</release>
 	<release tarname="libgomp-4.8.1-1-mingw32-dll-1.tar" >
 	  <download tarname="none"/>
 	  <requires eq="mingw32-libgcc-4.8.1-1-mingw32-dll-1.tar" />
@@ -603,6 +661,10 @@
         <release tarname="libssp-4.6.2-1-mingw32-dll-0.tar.lzma" />
         <release tarname="libssp-4.7.0-1-mingw32-dll-0.tar.lzma" />
         <release tarname="libssp-4.7.2-1-mingw32-dll-0.tar.lzma" />
+	<release tarname="libssp-4.8.1-2-mingw32-dll-0.tar" >
+	  <download tarname="none" />
+	  <requires eq="mingw32-libgcc-4.8.1-2-mingw32-dll-1.tar" />
+	</release>
 	<release tarname="libssp-4.8.1-1-mingw32-dll-0.tar" >
 	  <download tarname="none" />
 	  <requires eq="mingw32-libgcc-4.8.1-1-mingw32-dll-1.tar" />
@@ -621,6 +683,10 @@
         <release tarname="libquadmath-4.6.2-1-mingw32-dll-0.tar.lzma" />
         <release tarname="libquadmath-4.7.0-1-mingw32-dll-0.tar.lzma" />
         <release tarname="libquadmath-4.7.2-1-mingw32-dll-0.tar.lzma" />
+	<release tarname="libquadmath-4.8.1-2-mingw32-dll-0.tar" >
+	  <download tarname="none"/>
+	  <requires eq="mingw32-libgcc-4.8.1-2-mingw32-dll-1.tar" />
+	</release>
 	<release tarname="libquadmath-4.8.1-1-mingw32-dll-0.tar" >
 	  <download tarname="none"/>
 	  <requires eq="mingw32-libgcc-4.8.1-1-mingw32-dll-1.tar" />
-- 
2.11.0