Rename mingw packages

diff --git a/mingw32/autoconf.xml b/mingw32/mingw32-autoconf.xml
similarity index 94%
rename from mingw32/autoconf.xml
rename to mingw32/mingw32-autoconf.xml
index dbdfa2b..5f6a9b3 100644 (file)
--- a/mingw32/autoconf.xml
+++ b/mingw32/mingw32-autoconf.xml
@@ -2,7 +2,7 @@
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
   <package-collection subsystem="mingw32">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
-    <package name="autoconf">
+    <package name="mingw32-autoconf" alias="autoconf">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="autoconf: Wrapper scripts for autoconf commands">
         <paragraph>Autoconf is an extensible package of M4 macros that
@@ -23,8 +23,8 @@
         <requires eq="msys-core-*-msys-*-bin.tar" />
         <requires eq="msys-bash-*-msys-*-bin.tar" />
         <requires eq="msys-gawk-*-msys-*-bin.tar" />
-        <requires eq="autoconf2.1-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.1-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="autoconf-6-1-mingw32-doc.tar.lzma" />
@@ -37,7 +37,7 @@
       <licence tarname="autoconf-%-mingw32-%-lic.tar" />
       <source tarname="autoconf-%-mingw32-%-src.tar" />
     </package>
-    <package name="autoconf2.1">
+    <package name="mingw32-autoconf2.1" alias="autoconf2.1">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="autoconf2.1: Automatic Configure Script Builder (2.1x series)">
         <paragraph>Autoconf is an extensible package of M4 macros that
@@ -68,7 +68,7 @@
       <licence tarname="autoconf2.1-%-mingw32-%-lic.tar" />
       <source tarname="autoconf2.1-%-mingw32-%-src.tar" />
     </package>
-    <package name="autoconf2.5">
+    <package name="mingw32-autoconf2.5" alias="autoconf2.5">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="autoconf2.5: Automatic Configure Script Builder (2.5x/2.6x series)">
         <paragraph>Autoconf is an extensible package of M4 macros that

diff --git a/mingw32/automake.xml b/mingw32/mingw32-automake.xml
similarity index 84%
rename from mingw32/automake.xml
rename to mingw32/mingw32-automake.xml
index 3f5b090..5379d92 100644 (file)
--- a/mingw32/automake.xml
+++ b/mingw32/mingw32-automake.xml
@@ -2,7 +2,7 @@
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
   <package-collection subsystem="mingw32">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
-    <package name="automake">
+    <package name="mingw32-automake" alias="automake"
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake: Wrapper scripts for automake and aclocal">
         <paragraph>Automake is a tool for automatically generating
@@ -18,14 +18,14 @@
         <requires eq="msys-core-*-msys-*-bin.tar" />
         <requires eq="msys-bash-*-msys-*-bin.tar" />
         <requires eq="msys-gawk-*-msys-*-bin.tar" />
-        <requires eq="automake1.4-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.5-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.6-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.7-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.8-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.9-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.10-*-mingw32-*-bin.tar" />
-        <requires eq="automake1.11-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.4-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.6-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.7-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.8-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.9-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.10-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake1.11-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake-4-1-mingw32-doc.tar.lzma" />
@@ -36,7 +36,7 @@
       <licence tarname="automake-%-mingw32-%-lic.tar" />
       <source tarname="automake-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.4">
+    <package name="mingw32-automake1.4" alias="automake1.4">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.4: Automatic Makefile Builder (1.4 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -52,8 +52,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.1-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.1-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.4-1.4p6-1-mingw32-doc.tar.lzma" />
@@ -64,7 +64,7 @@
       <licence tarname="automake1.4-%-mingw32-%-lic.tar" />
       <source tarname="automake1.4-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.5">
+    <package name="mingw32-automake1.5" alias="automake1.5">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.5: Automatic Makefile Builder (1.5 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -80,8 +80,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.1-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.1-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.5-1.5-1-mingw32-doc.tar.lzma" />
@@ -92,7 +92,7 @@
       <licence tarname="automake1.5-%-mingw32-%-lic.tar" />
       <source tarname="automake1.5-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.6">
+    <package name="mingw32-automake1.6" alias="automake1.6">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.6: Automatic Makefile Builder (1.6 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -108,8 +108,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.6-1.6.3-1-mingw32-doc.tar.lzma" />
@@ -120,7 +120,7 @@
       <licence tarname="automake1.6-%-mingw32-%-lic.tar" />
       <source tarname="automake1.6-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.7">
+    <package name="mingw32-automake1.7" alias="automake1.7">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.7: Automatic Makefile Builder (1.7 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -136,8 +136,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.7-1.7.9-1-mingw32-doc.tar.lzma" />
@@ -148,7 +148,7 @@
       <licence tarname="automake1.7-%-mingw32-%-lic.tar" />
       <source tarname="automake1.7-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.8">
+    <package name="mingw32-automake1.8" alias="automake1.8">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.8: Automatic Makefile Builder (1.8 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -164,8 +164,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.8-1.8.5-1-mingw32-doc.tar.lzma" />
@@ -176,7 +176,7 @@
       <licence tarname="automake1.8-%-mingw32-%-lic.tar" />
       <source tarname="automake1.8-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.9">
+    <package name="mingw32-automake1.9" alias="automake1.9">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.9: Automatic Makefile Builder (1.9 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -192,8 +192,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.9-1.9.6-3-mingw32-doc.tar.lzma" />
@@ -204,7 +204,7 @@
       <licence tarname="automake1.9-%-mingw32-%-lic.tar" />
       <source tarname="automake1.9-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.10">
+    <package name="mingw32-automake1.10" alias="automake1.10">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.10: Automatic Makefile Builder (1.10 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -220,8 +220,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.10-1.10.2-1-mingw32-doc.tar.lzma" />
@@ -232,7 +232,7 @@
       <licence tarname="automake1.10-%-mingw32-%-lic.tar" />
       <source tarname="automake1.10-%-mingw32-%-src.tar" />
     </package>
-    <package name="automake1.11">
+    <package name="mingw32-automake1.11" alias="automake1.11">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="automake1.11: Automatic Makefile Builder (1.11 series)">
         <paragraph>Automake is a tool for automatically generating
@@ -248,8 +248,8 @@
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="autoconf2.5-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf2.5-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="automake1.11-1.11-1-mingw32-doc.tar.lzma" />

diff --git a/mingw32/libtool.xml b/mingw32/mingw32-libtool.xml
similarity index 89%
rename from mingw32/libtool.xml
rename to mingw32/mingw32-libtool.xml
index 550cce0..6df9777 100644 (file)
--- a/mingw32/libtool.xml
+++ b/mingw32/mingw32-libtool.xml
@@ -2,7 +2,7 @@
 <software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
   <package-collection subsystem="msys">
     <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
-    <package name="libtool">
+    <package name="mingw32-libtool" alias="libtool">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="libtool: A shared library generation tool" >
         <paragraph>GNU libtool is a generic library support package.
@@ -26,8 +26,8 @@
         <requires eq="msys-file-*-msys-*-bin.tar" />
         <requires eq="msys-m4-*-msys-*-bin.tar" />
         <requires eq="msys-texinfo-*-msys-*-bin.tar" />
-        <requires eq="autoconf-*-mingw32-*-bin.tar" />
-        <requires eq="automake-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-autoconf-*-mingw32-*-bin.tar" />
+        <requires eq="mingw32-automake-*-mingw32-*-bin.tar" />
       </component>
       <component class="doc">
         <release tarname="libtool-2.2.7a-1-mingw32-doc.tar.lzma" />
@@ -38,7 +38,7 @@
       <licence tarname="libtool-%-mingw32-%-lic.tar" />
       <source tarname="libtool-%-mingw32-%-src.tar" />
     </package>
-    <package name="libltdl">
+    <package name="mingw32-libltdl" alias="libltdl">
       <affiliate group="MSYS Developer Toolkit" />
       <description lang="en" title="libltdl: A portable dlopen replacement" >
         <paragraph>GNU libtool is a generic library support script.
@@ -58,8 +58,8 @@
       </component>
       <component class="dev">
         <release tarname="libltdl-2.2.7a-1-mingw32-dev.tar.lzma" />
-        <requires eq="libltdl-%-mingw32-%-dll-7.tar" />
-        <requires eq="libtool-%-mingw32-%-bin.tar" />
+        <requires eq="mingw32-libltdl-%-mingw32-%-dll-7.tar" />
+        <requires eq="mingw32-libtool-%-mingw32-%-bin.tar" />
       </component>
       <licence tarname="libtool-%-mingw32-%-lic.tar" />
       <source tarname="libtool-%-mingw32-%-src.tar" />