[Python-apps-commits] r1537 - in packages/mercurial/trunk/debian/patches (1 file)

[vdanjean at users.alioth.debian.org]

    Date: Tuesday, July 8, 2008 @ 19:04:59
  Author: vdanjean
Revision: 1537

Refresh quilt patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2008-07-08 19:04:54 UTC (rev 1536)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2008-07-08 19:04:59 UTC (rev 1537)
@@ -1,7 +1,7 @@
-Index: mercurial-1.0/doc/hgrc.5.txt
+Index: mercurial-git/doc/hgrc.5.txt
 ===================================================================
---- mercurial-1.0.orig/doc/hgrc.5.txt	2008-03-24 18:35:20.000000000 -0430
-+++ mercurial-1.0/doc/hgrc.5.txt	2008-03-31 19:46:08.000000000 -0430
+--- mercurial-git.orig/doc/hgrc.5.txt	2008-07-08 20:51:47.000000000 +0200
++++ mercurial-git/doc/hgrc.5.txt	2008-07-08 20:51:56.000000000 +0200
 @@ -534,7 +534,7 @@
    debug;;
      Print debugging information.  True or False.  Default is False.
@@ -11,10 +11,10 @@
    fallbackencoding;;
      Encoding to try if it's not possible to decode the changelog using
      UTF-8.  Default is ISO-8859-1.
-Index: mercurial-1.0/doc/ja/hg.1.ja.txt
+Index: mercurial-git/doc/ja/hg.1.ja.txt
 ===================================================================
---- mercurial-1.0.orig/doc/ja/hg.1.ja.txt	2008-03-24 18:35:20.000000000 -0430
-+++ mercurial-1.0/doc/ja/hg.1.ja.txt	2008-03-31 19:46:08.000000000 -0430
+--- mercurial-git.orig/doc/ja/hg.1.ja.txt	2008-07-08 20:51:47.000000000 +0200
++++ mercurial-git/doc/ja/hg.1.ja.txt	2008-07-08 20:51:56.000000000 +0200
 @@ -813,7 +813,7 @@
  EDITOR::
      これは hgmerge スクリプト中で使われるエディタの名前です。もし
@@ -24,10 +24,10 @@
  
  PYTHONPATH::
      これはインポートされるモジュールを見つけるために Python によっ
-Index: mercurial-1.0/doc/ja/hgrc.5.ja.txt
+Index: mercurial-git/doc/ja/hgrc.5.ja.txt
 ===================================================================
---- mercurial-1.0.orig/doc/ja/hgrc.5.ja.txt	2008-03-24 18:35:20.000000000 -0430
-+++ mercurial-1.0/doc/ja/hgrc.5.ja.txt	2008-03-31 19:46:08.000000000 -0430
+--- mercurial-git.orig/doc/ja/hgrc.5.ja.txt	2008-07-08 20:51:47.000000000 +0200
++++ mercurial-git/doc/ja/hgrc.5.ja.txt	2008-07-08 20:51:56.000000000 +0200
 @@ -119,7 +119,7 @@
      では False です。
    editor;;
@@ -37,10 +37,10 @@
    interactive;;
      ユーザに対してプロンプトを出すようにします。True か False を取
      ります。デフォルトでは True です。
-Index: mercurial-1.0/hgeditor
+Index: mercurial-git/hgeditor
 ===================================================================
---- mercurial-1.0.orig/hgeditor	2008-03-24 18:35:20.000000000 -0430
-+++ mercurial-1.0/hgeditor	2008-03-31 19:46:08.000000000 -0430
+--- mercurial-git.orig/hgeditor	2008-07-08 20:51:47.000000000 +0200
++++ mercurial-git/hgeditor	2008-07-08 20:51:56.000000000 +0200
 @@ -7,7 +7,7 @@
  # only for Mercurial, modify this:
  case "${EDITOR}" in
@@ -50,11 +50,11 @@
          ;;
      emacs)
          EDITOR="$EDITOR -nw"
-Index: mercurial-1.0/mercurial/commands.py
+Index: mercurial-git/mercurial/commands.py
 ===================================================================
---- mercurial-1.0.orig/mercurial/commands.py	2008-03-24 18:35:20.000000000 -0430
-+++ mercurial-1.0/mercurial/commands.py	2008-03-31 19:46:08.000000000 -0430
-@@ -867,8 +867,8 @@
+--- mercurial-git.orig/mercurial/commands.py	2008-07-08 20:51:47.000000000 +0200
++++ mercurial-git/mercurial/commands.py	2008-07-08 20:51:56.000000000 +0200
+@@ -870,8 +870,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -65,10 +65,10 @@
              ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
          else:
              ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
-Index: mercurial-1.0/mercurial/ui.py
+Index: mercurial-git/mercurial/ui.py
 ===================================================================
---- mercurial-1.0.orig/mercurial/ui.py	2008-03-24 18:35:21.000000000 -0430
-+++ mercurial-1.0/mercurial/ui.py	2008-03-31 19:50:26.000000000 -0430
+--- mercurial-git.orig/mercurial/ui.py	2008-07-08 20:51:47.000000000 +0200
++++ mercurial-git/mercurial/ui.py	2008-07-08 20:51:56.000000000 +0200
 @@ -483,4 +483,4 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or