[Python-apps-commits] r972 - in packages/mercurial/trunk/debian (4 files)

[vdanjean at users.alioth.debian.org]

    Date: Wednesday, April 16, 2008 @ 07:45:00
  Author: vdanjean
Revision: 972

Fix typo: Darcs is darcs and not darc

Added:
  packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darcs.patch
Modified:
  packages/mercurial/trunk/debian/README.Debian
  packages/mercurial/trunk/debian/patches/series
Deleted:
  packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darc.patch

Modified: packages/mercurial/trunk/debian/README.Debian
===================================================================
--- packages/mercurial/trunk/debian/README.Debian	2008-04-15 22:47:05 UTC (rev 971)
+++ packages/mercurial/trunk/debian/README.Debian	2008-04-16 07:45:00 UTC (rev 972)
@@ -48,7 +48,7 @@
 ------------------
 Foreign SCM converter.
 Depends: git-core | darc | monotone | bzr | subversion
-Depends: python-elementtree (for darc convertion only)
+Depends: python-elementtree (for darcs convertion only)
 
 Extension: hgk
 --------------

Deleted: packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darc.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darc.patch	2008-04-15 22:47:05 UTC (rev 971)
+++ packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darc.patch	2008-04-16 07:45:00 UTC (rev 972)
@@ -1,13 +0,0 @@
-Index: mercurial-git/hgext/convert/darcs.py
-===================================================================
---- mercurial-git.orig/hgext/convert/darcs.py	2008-04-06 22:05:27.000000000 +0200
-+++ mercurial-git/hgext/convert/darcs.py	2008-04-06 22:11:01.000000000 +0200
-@@ -30,7 +30,7 @@
-         checktool('darcs')
- 
-         if ElementTree is None:
--            raise util.Abort(_("Python ElementTree module is not available"))
-+            raise util.Abort(_("Python ElementTree module is not available. Try installing the python-elementtree Debian package to convert from darc"))
- 
-         if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
-             raise NoRepo("%s does not look like a darcs repo" % path)

Added: packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darcs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darcs.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/deb_specific__ElementTree_for_darcs.patch	2008-04-16 07:45:00 UTC (rev 972)
@@ -0,0 +1,13 @@
+Index: mercurial-git/hgext/convert/darcs.py
+===================================================================
+--- mercurial-git.orig/hgext/convert/darcs.py	2008-04-06 22:05:27.000000000 +0200
++++ mercurial-git/hgext/convert/darcs.py	2008-04-06 22:11:01.000000000 +0200
+@@ -30,7 +30,7 @@
+         checktool('darcs')
+ 
+         if ElementTree is None:
+-            raise util.Abort(_("Python ElementTree module is not available"))
++            raise util.Abort(_("Python ElementTree module is not available. Try installing the python-elementtree Debian package to convert from darcs"))
+ 
+         if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
+             raise NoRepo("%s does not look like a darcs repo" % path)

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2008-04-15 22:47:05 UTC (rev 971)
+++ packages/mercurial/trunk/debian/patches/series	2008-04-16 07:45:00 UTC (rev 972)
@@ -4,4 +4,4 @@
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch
 deb_specific__bash_completion_global_option_already_set.patch
-deb_specific__ElementTree_for_darc.patch
+deb_specific__ElementTree_for_darcs.patch