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

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

    Date: Saturday, February 5, 2011 @ 21:18:43
  Author: vicho-guest
Revision: 6581

Add patch for_upstream__add_backquote_fname.patch

It has been proposed upstream and fixes #611419

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2011-02-05 21:18:22 UTC (rev 6580)
+++ packages/mercurial/trunk/debian/changelog	2011-02-05 21:18:43 UTC (rev 6581)
@@ -3,8 +3,10 @@
   * New upstream release 1.7.5
   * Delete patch for_upstream__typo_in_manpage.patch which is now
     included upstream
+  * Add patch for_upstream__add_backquote_fname.patch , proposed
+    upstream (Closes: #611419)
 
- -- Javi Merino <cibervicho at gmail.com>  Sat, 05 Feb 2011 20:53:42 +0000
+ -- Javi Merino <cibervicho at gmail.com>  Sat, 05 Feb 2011 20:58:01 +0000
 
 mercurial (1.7.3-1) experimental; urgency=low
 

Added: packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__add_backquote_fname.patch	2011-02-05 21:18:43 UTC (rev 6581)
@@ -0,0 +1,35 @@
+# HG changeset patch
+# Parent 259760fb51f780817bc76d0a27036428abd49da4
+doc: Add back quotes around filenames
+
+Filenames starting with a dot (.hg and .hgignore) confuse man when
+creating the ps documentation with "man -t hg >hg.ps" if they are not
+enclosed in back quotes.
+
+diff --git a/mercurial/commands.py b/mercurial/commands.py
+--- a/mercurial/commands.py
++++ b/mercurial/commands.py
+@@ -58,7 +58,7 @@ def addremove(ui, repo, *pats, **opts):
+     repository.
+ 
+     New files are ignored if they match any of the patterns in
+-    .hgignore. As with add, these changes take effect at the next
++    ``.hgignore``. As with add, these changes take effect at the next
+     commit.
+ 
+     Use the -s/--similarity option to detect renamed files. With a
+@@ -670,12 +670,12 @@ def clone(ui, source, dest=None, **opts)
+     basename of the source.
+ 
+     The location of the source is added to the new repository's
+-    .hg/hgrc file, as the default to be used for future pulls.
++    ``.hg/hgrc`` file, as the default to be used for future pulls.
+ 
+     See :hg:`help urls` for valid source format details.
+ 
+     It is possible to specify an ``ssh://`` URL as the destination, but no
+-    .hg/hgrc and working directory will be created on the remote side.
++    ``.hg/hgrc`` and working directory will be created on the remote side.
+     Please see :hg:`help urls` for important details about ``ssh://`` URLs.
+ 
+     A set of changesets (tags, or branch names) to pull may be specified

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2011-02-05 21:18:22 UTC (rev 6580)
+++ packages/mercurial/trunk/debian/patches/series	2011-02-05 21:18:43 UTC (rev 6581)
@@ -5,3 +5,4 @@
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
+for_upstream__add_backquote_fname.patch