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

[vicho at users.alioth.debian.org]

    Date: Monday, October 21, 2013 @ 20:50:06
  Author: vicho
Revision: 10125

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2013-10-21 20:49:56 UTC (rev 10124)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2013-10-21 20:50:06 UTC (rev 10125)
@@ -108,7 +108,7 @@
          if self.automatestdio:
 --- a/hgext/convert/subversion.py
 +++ b/hgext/convert/subversion.py
-@@ -19,6 +19,7 @@ from cStringIO import StringIO
+@@ -20,6 +20,7 @@ from cStringIO import StringIO
  from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
  from common import commandline, converter_source, converter_sink, mapfile
  from common import makedatetimestamp
@@ -116,7 +116,7 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -235,16 +236,19 @@ class svn_source(converter_source):
+@@ -236,16 +237,19 @@ class svn_source(converter_source):
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1023,6 +1027,8 @@ class svn_sink(converter_sink, commandli
+@@ -1024,6 +1028,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
@@ -150,7 +150,7 @@
          commandline.__init__(self, ui, 'svn')
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -204,7 +204,8 @@ class _httprequesthandleropenssl(_httpre
+@@ -207,7 +207,8 @@ class _httprequesthandleropenssl(_httpre
              import OpenSSL
              OpenSSL.SSL.Context
          except ImportError:
@@ -160,7 +160,7 @@
          ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
          ctx.use_privatekey_file(ssl_cert)
          ctx.use_certificate_file(ssl_cert)
-@@ -245,7 +246,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -248,7 +249,8 @@ class _httprequesthandlerssl(_httpreques
              import ssl
              ssl.wrap_socket
          except ImportError:

Modified: packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2013-10-21 20:49:56 UTC (rev 10124)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2013-10-21 20:50:06 UTC (rev 10125)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -368,7 +368,7 @@ funcs = {
+@@ -373,7 +373,7 @@ funcs = {
  
  # template engine
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-10-21 20:49:56 UTC (rev 10124)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-10-21 20:50:06 UTC (rev 10125)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2089,8 +2089,8 @@ def debuginstall(ui):
+@@ -2091,8 +2091,8 @@ def debuginstall(ui):
      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
-@@ -754,7 +754,7 @@ class ui(object):
+@@ -755,7 +755,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -11937,8 +11937,8 @@ msgstr " (шаблоны, похоже,
+@@ -12019,8 +12019,8 @@ msgstr " (шаблоны, похоже,
  msgid "checking commit editor...\n"
  msgstr "проверка редактора сообщений фиксации...\n"
  
@@ -402,7 +402,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (задайте редактор сообщений в вашем конфиге)\n"
-@@ -18557,10 +18557,12 @@ msgstr ""
+@@ -18656,10 +18656,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19733,14 +19735,14 @@ msgid ""
+@@ -19832,14 +19834,14 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"

Modified: packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2013-10-21 20:49:56 UTC (rev 10124)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2013-10-21 20:50:06 UTC (rev 10125)
@@ -7,10 +7,9 @@
  This fixes it at least in Debian.  I'm unsure about other systems.
 Bug: http://bz.selenic.com/show_bug.cgi?id=4045
 
-diff --git a/tests/run-tests.py b/tests/run-tests.py
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -429,7 +429,7 @@ def usecorrectpython():
+@@ -430,7 +430,7 @@ def usecorrectpython():
               sys.executable)
          mypython = os.path.join(BINDIR, pyexename)
          try: