Remove redundant source/licence references for mingwrt/w32api.

diff --git a/ChangeLog b/ChangeLog
index 637d291..354d9df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-30  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Remove redundant source/licence references for mingwrt/w32api.
+
+       * mingw32/mingw32-runtime.xml (mingwrt, w32api): Make...
+       (source, licence): ...these references at package level generic wrt
+       compression format; remove redundant duplicates at release level.
+       Regenerate and republish LZMA format manifest.
+       * mingw32/issue.log: Updated accordingly.
+
 2012-06-30  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
        Update & publish mingwrt.

diff --git a/mingw32/issue.log b/mingw32/issue.log
index 1f762bb..bc808e2 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -54,7 +54,7 @@
   f04e64fef62d2dac423b664b3d502ef36e34074c 2011101100 mingw32-pexports.xml
   2dc9b22e0a53267bd4f764100b4d01b740f3aa87 2011101100 mingw32-popt.xml
   9399cb6c2efd8fd907c42a278a6f41bbde9e440c 2011091400 mingw32-pthreads-w32.xml
-  a3d7fbc9339f748d7e3739e158dbe4a8a0dc7b1c 2012063000 mingw32-runtime.xml
+  428964289b3509293a13c9394199b5e2d4887c3e 2012063001 mingw32-runtime.xml
   a8d4de8b2feefdf9744cff733051e395f72e7b21 2011101400 mingw32-xz.xml
   0514f6a48779110bb6dc3dee17defcdc5f1d1bae 2012051700 mingw32-zlib.xml
 #

diff --git a/mingw32/mingw32-runtime.xml b/mingw32/mingw32-runtime.xml
index c83d698..59a92d3 100644 (file)
--- a/mingw32/mingw32-runtime.xml
+++ b/mingw32/mingw32-runtime.xml
@@ -24,48 +24,24 @@
         </paragraph>
       </description>
 
-      <source tarname="mingwrt-%-mingw32-src.tar.lzma" />
-      <licence tarname="mingwrt-%-mingw32-dev.tar.lzma" />
+      <source tarname="mingwrt-%-mingw32-src.tar.%" />
+      <licence tarname="mingwrt-%-mingw32-dev.tar.%" />
 
       <component class="dev">
         <requires eq="mingwrt-%-mingw32-dll.tar" />
         <release tarname="mingwrt-3.20-2-mingw32-dev.tar.lzma" />
-        <release tarname="mingwrt-3.20-mingw32-dev.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
-        <release tarname="mingwrt-3.19-mingw32-dev.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
-        <release tarname="mingwrt-3.18-mingw32-dev.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
-        <release tarname="mingwrt-3.17-mingw32-dev.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
+        <release tarname="mingwrt-3.20-mingw32-dev.tar.gz" />
+        <release tarname="mingwrt-3.19-mingw32-dev.tar.gz" />
+        <release tarname="mingwrt-3.18-mingw32-dev.tar.gz" />
+        <release tarname="mingwrt-3.17-mingw32-dev.tar.gz" />
       </component>
 
       <component class="dll">
         <release tarname="mingwrt-3.20-2-mingw32-dll.tar.lzma" />
-        <release tarname="mingwrt-3.20-mingw32-dll.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
-        <release tarname="mingwrt-3.19-mingw32-dll.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
-        <release tarname="mingwrt-3.18-mingw32-dll.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
-        <release tarname="mingwrt-3.17-mingw32-dll.tar.gz">
-          <source tarname="mingwrt-%-mingw32-src.tar.gz" />
-          <licence tarname="mingwrt-%-mingw32-dev.tar.gz" />
-       </release>
+        <release tarname="mingwrt-3.20-mingw32-dll.tar.gz" />
+        <release tarname="mingwrt-3.19-mingw32-dll.tar.gz" />
+        <release tarname="mingwrt-3.18-mingw32-dll.tar.gz" />
+        <release tarname="mingwrt-3.17-mingw32-dll.tar.gz" />
       </component>
     </package>
 
@@ -84,27 +60,15 @@
         </paragraph>
       </description>
 
+      <source tarname="w32api-%-mingw32-src.tar.%" />
+      <licence tarname="w32api-%-mingw32-dev.tar.%" />
+
       <component class="dev">
-        <release tarname="w32api-3.17-2-mingw32-dev.tar.lzma" >
-          <licence tarname="w32api-%-mingw32-dev.tar.lzma" />
-          <source tarname="w32api-%-mingw32-src.tar.lzma" />
-        </release>
-        <release tarname="w32api-3.17-1-mingw32-dev.tar.lzma" >
-          <licence tarname="w32api-%-mingw32-dev.tar.lzma" />
-          <source tarname="w32api-%-mingw32-src.tar.lzma" />
-        </release>
-        <release tarname="w32api-3.16-1-mingw32-dev.tar.lzma" >
-          <licence tarname="w32api-%-mingw32-dev.tar.lzma" />
-          <source tarname="w32api-%-mingw32-src.tar.lzma" />
-        </release>
-        <release tarname="w32api-3.15-1-mingw32-dev.tar.lzma" >
-          <licence tarname="w32api-%-mingw32-dev.tar.lzma" />
-          <source tarname="w32api-%-mingw32-src.tar.lzma" />
-        </release>
-        <release tarname="w32api-3.14-mingw32-dev.tar.gz" >
-          <licence tarname="w32api-%-mingw32-dev.tar.gz" />
-          <source tarname="w32api-%-mingw32-src.tar.gz" />
-        </release>
+        <release tarname="w32api-3.17-2-mingw32-dev.tar.lzma" />
+        <release tarname="w32api-3.17-1-mingw32-dev.tar.lzma" />
+        <release tarname="w32api-3.16-1-mingw32-dev.tar.lzma" />
+        <release tarname="w32api-3.15-1-mingw32-dev.tar.lzma" />
+        <release tarname="w32api-3.14-mingw32-dev.tar.gz" />
       </component>
     </package>