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

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

    Date: Sunday, October 30, 2011 @ 15:01:47
  Author: vicho-guest
Revision: 7731

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2011-10-30 15:01:42 UTC (rev 7730)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2011-10-30 15:01:47 UTC (rev 7731)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -379,8 +379,7 @@
+@@ -380,8 +380,7 @@
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2011-10-30 15:01:42 UTC (rev 7730)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2011-10-30 15:01:47 UTC (rev 7731)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -379,7 +379,7 @@
+@@ -380,7 +380,7 @@
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2011-10-30 15:01:42 UTC (rev 7730)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2011-10-30 15:01:47 UTC (rev 7731)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -193,7 +193,7 @@
+@@ -196,7 +196,7 @@
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -385,14 +385,6 @@
+@@ -386,14 +386,6 @@
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

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-30 15:01:42 UTC (rev 7730)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-10-30 15:01:47 UTC (rev 7731)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1776,8 +1776,8 @@
+@@ -1875,8 +1875,8 @@
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -663,7 +663,7 @@
+@@ -677,7 +677,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -320,7 +320,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/mercurial/help/config.txt
 +++ b/mercurial/help/config.txt
-@@ -1012,7 +1012,8 @@
+@@ -1016,7 +1016,8 @@
      Print debugging information. True or False. Default is False.
  
  ``editor``