[SCM] collaborative maintenance of the dopewars package branch, master, updated. debian/1.5.12-12-14-g4aa0cfe

[Dean Evans]

The following commit has been merged in the master branch:
commit c40ff5a15fe8c6b64fd82ecbd72893050e91dda1
Author: Dean Evans <dean at codemonkies.net>
Date:   Mon Feb 20 17:15:39 2012 +1300

    Correct a mistake in the patch files causing them to not be applied.

diff --git a/debian/patches/doc_Makefile.am.patch b/debian/patches/doc_Makefile.am.patch
index 746278d..3719b4c 100755
--- a/debian/patches/doc_Makefile.am.patch
+++ b/debian/patches/doc_Makefile.am.patch
@@ -1,6 +1,7 @@
-Description: Patch to correct the path in doc/Makefile.am.--- a/doc/Makefile.am
+Description: Patch to correct the path in doc/Makefile.am.
 Origin: other
 
+--- a/doc/Makefile.am
 +++ b/doc/Makefile.am
 @@ -1,4 +1,4 @@
 -DOCPATH        = ${DESTDIR}${datadir}/doc/${PACKAGE}-${VERSION}/
diff --git a/debian/patches/po_fr_CA.po.patch b/debian/patches/po_fr_CA.po.patch
index 8b54ada..db92e23 100755
--- a/debian/patches/po_fr_CA.po.patch
+++ b/debian/patches/po_fr_CA.po.patch
@@ -1,6 +1,7 @@
-Description: Patch to update the translations in po/fr_CA.po.--- a/po/fr_CA.po
+Description: Patch to update the translations in po/fr_CA.po.
 Origin: other
 
+--- a/po/fr_CA.po
 +++ b/po/fr_CA.po
 @@ -6,7 +6,7 @@
  "Project-Id-Version: dopewars 1.5.10\n"

-- 
collaborative maintenance of the dopewars package