Replace msys-cygutils-dos2unix with msys-dos2unix

diff --git a/ChangeLog b/ChangeLog
index 5eaa246..4f3013d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2012-04-09  Erwin Waterlander  <waterlan@xs4all.nl>
 
+       Replace msys-cygutils-dos2unix with msys-dos2unix.
+
+       * msys/msys-cygutils.xml: Removed msys-cygutils-dos2unix
+       package element. Modified msys-cygutils description to refer
+       to the new msys-dos2unix package.
+       * msys/msys-dos2unix.xml: New file.
+       * msys/msys-package-list.xml: Added msys-dos2unix.xml.
+       * msys/msys-base.xml: Replaced msys-coreutils-dos2unix-*-bin
+       with msys-dos2unix-*-bin.
+       * msys/issue.log: Updated accordingly.
+
+2012-04-09  Erwin Waterlander  <waterlan@xs4all.nl>
+
        Replace mingw32-cygutils-dos2unix with mingw32-dos2unix.
        Remove (unnecessary) mingw32-cygutils.
 

diff --git a/msys/issue.log b/msys/issue.log
index e84dd54..c5b5209 100644 (file)
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -27,7 +27,7 @@
   a9c8f9889e2f35406d1260d474fe763026570f05 2011102400 msys-autoconf.xml
   e98db194caacc14609ea6bc23b811aafcfcb8980 2011101100 msys-autogen.xml
   972b14a61f7d4d2973681ca270d1760bb3d46155 2011101100 msys-automake.xml
-  02484856dd19f2feae156932e04165f11b7f2cdc 2011060500 msys-base.xml
+  b065e9528568d9250b98cf6a15e5f0b5ce5df559 2012040200 msys-base.xml
   026fd2d0fabe053455e2ca45cd0bb1b1be816305 2011101100 msys-bash.xml
   e52982cbff0b0bb825461deb9af0411f72f2e4a2 2010090600 msys-binutils.xml
   0a5427440a7eb58b9050ffe905070f0395912878 2011101100 msys-bison.xml
@@ -37,10 +37,11 @@
   c2bdd0aaadeb88b13dad49361c4cbdb152b5c3d4 2011101100 msys-coreutils.xml
   cf986305d21dd0d4073b3c5049c24381d6c06c03 2011101100 msys-crypt.xml
   344683fff6bf09f305d07f41e95a4586b0af228d 2011101100 msys-cvs.xml
-  e9ce832261437be99308351cf6602f1719f2bb74 2011101100 msys-cygutils.xml
+  2db65708668c92c29bf4dbaa66d8702382469e93 2012040200 msys-cygutils.xml
   32b57f2cd38488fe4272af15a76de9309d3bd67b 2011101100 msys-dash.xml
   d407796871cc5a505c83ba74fda087bb45f4aab3 2011101100 msys-diffstat.xml
   e1c0666fccf5154604f4d513d69ee51b1bc2b869 2011101100 msys-diffutils.xml
+  06490dee6c87f3f05047c05fc635a674d5b5efbb 2012040500 msys-dos2unix.xml
   5f5b3b44b82ee98fe6da471eb7f9c0938f36ee78 2011101100 msys-expat.xml
   c9488c5576dd54dbc1f37790756f603bfb3ffdf9 2011101100 msys-file.xml
   3cc91761fd6aa80f2733fc6ddf29a00957f03d02 2011101100 msys-findutils.xml
@@ -72,7 +73,7 @@
   d6919edb030a8a129da743f1c05756d99f5b6c81 2011101100 msys-mktemp.xml
   6ffc1c28147bd62d234f71070d53f9cb99a2cfe0 2011101100 msys-openssh.xml
   148f363053f2c38739fe30ccd980afc40e2d9b8b 2011101100 msys-openssl.xml
-  0bef7d4988dc20387f08126f82fb7ca386bfd65a 2011111800 msys-package-list.xml
+  0defc38585dbedbe010d82bdf6e4dbbae8fb1398 2012040500 msys-package-list.xml
   667afd4295b0aab7eef5682de27d2bfc6d80b03f 2011101100 msys-patch.xml
   1c2617eb65b17b242641af116b294523987dc32e 2011101100 msys-perl.xml
   fb5aa962dfcb854674196f008e1a170ac70d4a4f 2011101100 msys-popt.xml

diff --git a/msys/msys-base.xml b/msys/msys-base.xml
index 0a0156f..5cfeed0 100644 (file)
--- a/msys/msys-base.xml
+++ b/msys/msys-base.xml
@@ -46,7 +46,7 @@
         <requires eq="msys-bzip2-*-msys-*-bin.tar" />
         <requires eq="msys-core-*-msys-*-ext.tar" />
         <requires eq="msys-coreutils-*-msys-*-bin.tar" />
-        <requires eq="msys-cygutils-dos2unix-*-msys-*-bin.tar" />
+        <requires eq="msys-dos2unix-*-msys-*-bin.tar" />
         <requires eq="msys-diffutils-*-msys-*-bin.tar" />
         <requires eq="msys-findutils-*-msys-*-bin.tar" />
         <requires eq="msys-file-*-msys-*-bin.tar" />

diff --git a/msys/msys-cygutils.xml b/msys/msys-cygutils.xml
index 05d487f..905fb29 100644 (file)
--- a/msys/msys-cygutils.xml
+++ b/msys/msys-cygutils.xml
@@ -30,9 +30,10 @@
           embedded within the lpr-enhanced script for more information.
         </paragraph>
         <paragraph>The msys-cygutils package provides many of the utilities
-          included in the cygutils distribution, except that the associated
-          msys-cygutils-dos2unix package provides the line-ending conversion
-          programs.
+          included in the cygutils distribution. Note that the 'dos2unix'
+          utilities are NOT provided by this package; the separate msys-dos2unix
+          package provides versions of those utilities derived from alternate
+          sources.
         </paragraph>
       </description>
 
@@ -55,41 +56,6 @@
       </component>
     </package>
 
-    <package name="msys-cygutils-dos2unix" alias="msys-dos2unix">
-      <affiliate group="MSYS Base System" />
-      <description lang="en" title="cygutils-dos2unix (msys): line-ending conversion utilities" >
-        <paragraph>The cygutils-dos2unix package contains implementations of
-          dos2unix and unix2dos (d2u, u2d) for modifying the line-ending
-          character(s) used by text files. Each can operate on a list of
-          files, converting them in-place, or as part of a pipeline.
-        </paragraph>
-        <paragraph>The MinGW/MSYS project provides two versions of the
-          cygutils-dos2unix package: this msys-cygutils-dos2unix one, and
-          the mingw32-cygutils-dos2unix version. This version requires the
-          MSYS dll, but directly understands MSYS pathnames and blends more
-          seamlessly into pipelines with other MSYS tools. The mingw32
-          version does not require the MSYS dll, and is a direct replacement
-          for the old d2u and u2d scripts, and for the unix2dos/dos2unix
-          executables that were long part of the mingw-utils package.
-        </paragraph>
-        <paragraph>The msys-cygutils-dos2unix package provides the unix2dos
-          and dos2unix (u2d, d2u) conversion programs. The associated
-          msys-cygutils package provides other useful utilities and
-          documentation.
-        </paragraph>
-      </description>
-
-      <source tarname="cygutils-%-msys-%-src.tar.%" />
-      <licence tarname="cygutils-%-msys-%-lic.tar.%" />
-
-      <component class="bin">
-        <requires eq="msys-core-*-msys-*-bin.tar" />
-        <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-bin.tar.lzma">
-          <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
-        </release>
-      </component>
-    </package>
-
   </package-collection>
 </software-distribution>
 <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-dos2unix.xml b/msys/msys-dos2unix.xml
new file mode 100644 (file)
index 0000000..93e6b38
--- /dev/null
+++ b/msys/msys-dos2unix.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<software-distribution project="MinGW" home="http://mingw.org" issue="@YYYYMMDDNN@">
+
+  <!-- File: msys-dos2unix.xml -->
+
+  <package-collection subsystem="msys">
+    <download-host uri="http://prdownloads.sourceforge.net/mingw/%F?download" />
+
+    <package name="msys-dos2unix" alias="msys-cygutils-dos2unix">
+      <affiliate group="MSYS Base System" />
+      <description lang="en" title="dos2unix: Convert line breaks between Unix, Dos, and Mac">
+        <paragraph> The dos2unix package provides manipulation utilities for
+          converting the line break characters of text files between the unix
+          convention (0x0a), the DOS/Windows convention (0x0d 0x0a), and the old
+          (pre-OS-X) Mac convention (0x0d).
+        </paragraph>
+      </description>
+
+      <licence tarname="dos2unix-%-msys-%-lic.tar.%" />
+      <source tarname="dos2unix-%-msys-%-src.tar.%" />
+
+      <component class="bin">
+        <release tarname="dos2unix-5.3.3-1-msys-1.0.17-bin.tar.lzma" >
+          <requires eq="msys-core-*-msys-*-bin.tar" />
+          <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
+          <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
+        </release>
+        <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-bin.tar.lzma">
+          <licence tarname="cygutils-%-msys-%-lic.tar.%" />
+          <source tarname="cygutils-%-msys-%-src.tar.%" />
+          <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
+        </release>
+      </component>
+
+      <component class="doc">
+        <release tarname="dos2unix-5.3.3-1-msys-1.0.17-doc.tar.lzma" />
+        <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-doc.tar.lzma">
+          <licence tarname="cygutils-%-msys-%-lic.tar.%" />
+          <source tarname="cygutils-%-msys-%-src.tar.%" />
+        </release>
+      </component>
+
+      <component class="lic">
+        <release tarname="dos2unix-5.3.3-1-msys-1.0.17-lic.tar.lzma" />
+        <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-lic.tar.lzma">
+          <licence tarname="cygutils-%-msys-%-lic.tar.%" />
+          <source tarname="cygutils-%-msys-%-src.tar.%" />
+        </release>
+      </component>
+    </package>
+
+  </package-collection>
+</software-distribution>
+<!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->

diff --git a/msys/msys-package-list.xml b/msys/msys-package-list.xml
index 22321ca..25d6258 100644 (file)
--- a/msys/msys-package-list.xml
+++ b/msys/msys-package-list.xml
@@ -31,6 +31,7 @@
   <package-list catalogue="msys-dash" />
   <package-list catalogue="msys-diffutils" />
   <package-list catalogue="msys-diffstat" />
+  <package-list catalogue="msys-dos2unix" />
   <package-list catalogue="msys-expat" />
   <package-list catalogue="msys-file" />
   <package-list catalogue="msys-findutils" />