From c8bb4d23cea23758ebdfc3936a5d4a99d1de881b Mon Sep 17 00:00:00 2001
From: Keith Marshall <keithmarshall@users.sourceforge.net>
Date: Sun, 15 Apr 2012 13:25:30 +0000
Subject: [PATCH] Correct msys-dos2unix doc and licence package reference
 anomalies.

---
 ChangeLog              | 13 +++++++++++++
 msys/issue.log         |  2 +-
 msys/msys-dos2unix.xml | 10 +++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f3013d..e2ec910 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-15  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+	Correct msys-dos2unix doc and licence package reference anomalies.
+
+	* msys/msys-dos2unix.xml: Update and republish.
+	(cygutils-dos2unix-1.3.4-4-msys-1.0.13-doc.tar.lzma): Declare it as a
+	virtual package; add 'requires' specification, linking it to...
+	(cygutils-1.3.4-4-msys-1.0.13-doc.tar): ...this.
+	(cygutils-dos2unix-1.3.4-4-msys-1.0.13-lic.tar.lzma): Likewise...
+	(cygutils-1.3.4-4-msys-1.0.13-lic.tar): ...linking to this.
+
+	* msys/issue.log: Updated accordingly.
+
 2012-04-09  Erwin Waterlander  <waterlan@xs4all.nl>
 
 	Replace msys-cygutils-dos2unix with msys-dos2unix.
diff --git a/msys/issue.log b/msys/issue.log
index c5b5209..dcda60c 100644
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -41,7 +41,7 @@
   32b57f2cd38488fe4272af15a76de9309d3bd67b 2011101100 msys-dash.xml
   d407796871cc5a505c83ba74fda087bb45f4aab3 2011101100 msys-diffstat.xml
   e1c0666fccf5154604f4d513d69ee51b1bc2b869 2011101100 msys-diffutils.xml
-  06490dee6c87f3f05047c05fc635a674d5b5efbb 2012040500 msys-dos2unix.xml
+  f6af4ec1a55662d45355be90387d2c7c292079d7 2012041500 msys-dos2unix.xml
   5f5b3b44b82ee98fe6da471eb7f9c0938f36ee78 2011101100 msys-expat.xml
   c9488c5576dd54dbc1f37790756f603bfb3ffdf9 2011101100 msys-file.xml
   3cc91761fd6aa80f2733fc6ddf29a00957f03d02 2011101100 msys-findutils.xml
diff --git a/msys/msys-dos2unix.xml b/msys/msys-dos2unix.xml
index 93e6b38..b6a3c75 100644
--- a/msys/msys-dos2unix.xml
+++ b/msys/msys-dos2unix.xml
@@ -26,7 +26,7 @@
           <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.%" />
+          <licence tarname="cygutils-dos2unix-%-msys-%-lic.tar.%" />
           <source tarname="cygutils-%-msys-%-src.tar.%" />
           <requires eq="msys-libpopt-*-msys-*-dll-0.tar" />
         </release>
@@ -35,7 +35,9 @@
       <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.%" />
+          <download tarname="none" />
+          <requires eq="msys-cygutils-%-msys-%-doc.tar" />
+          <licence tarname="cygutils-dos2unix-%-msys-%-lic.tar.%" />
           <source tarname="cygutils-%-msys-%-src.tar.%" />
         </release>
       </component>
@@ -43,7 +45,9 @@
       <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.%" />
+          <download tarname="none" />
+          <requires eq="msys-cygutils-%-msys-%-lic.tar" />
+          <licence tarname="cygutils-dos2unix-%-msys-%-lic.tar.%" />
           <source tarname="cygutils-%-msys-%-src.tar.%" />
         </release>
       </component>
-- 
2.11.0