[Python-apps-commits] r1536 - in packages/mercurial/trunk/debian (3 files)

[vdanjean at users.alioth.debian.org]

    Date: Tuesday, July 8, 2008 @ 19:04:54
  Author: vdanjean
Revision: 1536

document accepted darcs format

Added:
  packages/mercurial/trunk/debian/patches/convert-darc-doc.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2008-07-08 19:04:47 UTC (rev 1535)
+++ packages/mercurial/trunk/debian/changelog	2008-07-08 19:04:54 UTC (rev 1536)
@@ -6,6 +6,8 @@
       #486299)
   * fix wrong ucf registration (/etc/hgrc.d/ vs /etc/mercurial/hgrc.d/)
     (Closes: #487089). Thanks Max Bowsher for noticing.
+  * add a mention to "legacy Darcs 1 format" in convert documentation
+    (Closes: #485887)
 
  -- Vincent Danjean <vdanjean at debian.org>  Tue, 08 Jul 2008 20:40:05 +0200
 

Added: packages/mercurial/trunk/debian/patches/convert-darc-doc.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/convert-darc-doc.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/convert-darc-doc.patch	2008-07-08 19:04:54 UTC (rev 1536)
@@ -0,0 +1,13 @@
+Index: mercurial-git/hgext/convert/__init__.py
+===================================================================
+--- mercurial-git.orig/hgext/convert/__init__.py	2008-07-08 20:55:52.000000000 +0200
++++ mercurial-git/hgext/convert/__init__.py	2008-07-08 20:56:16.000000000 +0200
+@@ -16,7 +16,7 @@
+     Accepted source formats:
+     - Mercurial
+     - CVS
+-    - Darcs
++    - Darcs (legacy Darcs 1 format only)
+     - git
+     - Subversion
+     - Monotone

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2008-07-08 19:04:47 UTC (rev 1535)
+++ packages/mercurial/trunk/debian/patches/series	2008-07-08 19:04:54 UTC (rev 1536)
@@ -5,4 +5,5 @@
 deb_specific__hgk.py.patch
 deb_specific__bash_completion_global_option_already_set.patch
 deb_specific__ElementTree_for_darcs.patch
+convert-darc-doc.patch
 backport__CVE-2008-2942-fix.patch