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

[vicho-guest at users.alioth.debian.org]

    Date: Sunday, October 16, 2011 @ 12:40:18
  Author: vicho-guest
Revision: 7651

Don't patch the autogenerated docs.

They are removed in make clean (so it's completely pointless).
Moreover, the HTML doc is not regenerated so "dpkg-source
--after-build" fails.

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	2011-10-16 10:36:36 UTC (rev 7650)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-10-16 12:40:18 UTC (rev 7651)
@@ -283,48 +283,3 @@
  
  PYTHONPATH
      This is used by Python to find imported modules and may need to be
---- a/doc/hg.1
-+++ b/doc/hg.1
-@@ -3282,7 +3282,7 @@
- editor it uses is determined by looking at the environment
- variables HGEDITOR, VISUAL and EDITOR, in that order. The first
- non\-empty one is chosen. If all of them are empty, the editor
--defaults to \(aqvi\(aq.
-+defaults to \(aqsensible-editor\(aq.
- .TP
- .B PYTHONPATH
- .
---- a/doc/hg.1.html
-+++ b/doc/hg.1.html
-@@ -2701,7 +2701,7 @@
- editor it uses is determined by looking at the environment
- variables HGEDITOR, VISUAL and EDITOR, in that order. The first
- non-empty one is chosen. If all of them are empty, the editor
--defaults to 'vi'.</dd>
-+defaults to 'sensible-editor'.</dd>
- <dt>PYTHONPATH</dt>
- <dd>This is used by Python to find imported modules and may need to be
- set appropriately if this Mercurial is not installed system-wide.</dd>
---- a/doc/hgrc.5
-+++ b/doc/hgrc.5
-@@ -1254,7 +1254,8 @@
- .TP
- .B \fBeditor\fP
- .sp
--The editor to use during a commit. Default is \fB$EDITOR\fP or \fBvi\fP.
-+The editor to use during a commit. Default is \fB$EDITOR\fP or
-+\fBsensible-editor\fP.
- .TP
- .B \fBfallbackencoding\fP
- .sp
---- a/doc/hgrc.5.html
-+++ b/doc/hgrc.5.html
-@@ -977,7 +977,7 @@
- <dt><tt class="docutils literal">debug</tt></dt>
- <dd>Print debugging information. True or False. Default is False.</dd>
- <dt><tt class="docutils literal">editor</tt></dt>
--<dd>The editor to use during a commit. Default is <tt class="docutils literal">$EDITOR</tt> or <tt class="docutils literal">vi</tt>.</dd>
-+<dd>The editor to use during a commit. Default is <tt class="docutils literal">$EDITOR</tt> or <tt class="docutils literal">sensible-editor</tt>.</dd>
- <dt><tt class="docutils literal">fallbackencoding</tt></dt>
- <dd>Encoding to try if it's not possible to decode the changelog using
- UTF-8. Default is ISO-8859-1.</dd>