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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sat Nov 8 10:22:49 UTC 2014 

    Date: Saturday, November 8, 2014 @ 10:22:48
  Author: vicho
Revision: 11555

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  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__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2014-11-08 10:22:45 UTC (rev 11554)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2014-11-08 10:22:48 UTC (rev 11555)
@@ -8,14 +8,13 @@
 Bug-Debian: http://bugs.debian.org/620087
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250
 Forwarded: not-needed
-Last-Update: 2011-03-30
- 
+
 --- a/setup.py
 +++ b/setup.py
-@@ -422,7 +422,6 @@ cmdclass = {'build': hgbuild,
-             'build_ext': hgbuildext,
+@@ -461,7 +461,6 @@ cmdclass = {'build': hgbuild,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,
+             'install_lib': hginstalllib,
 -            'install_scripts': hginstallscripts,
              'build_hgexe': buildhgexe,
              }

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2014-11-08 10:22:45 UTC (rev 11554)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2014-11-08 10:22:48 UTC (rev 11555)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -343,6 +343,6 @@ def view(ui, repo, *etc, **opts):
+@@ -347,6 +347,6 @@ def view(ui, repo, *etc, **opts):
      "start interactive history viewer"
      os.chdir(repo.root)
      optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2014-11-08 10:22:45 UTC (rev 11554)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2014-11-08 10:22:48 UTC (rev 11555)
@@ -74,9 +74,9 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -94,7 +94,7 @@ class convert_git(converter_source):
-         if not os.path.exists(path + "/objects"):
-             raise NoRepo(_("%s does not look like a Git repository") % path)
+@@ -107,7 +107,7 @@ class convert_git(converter_source):
+         else:
+             self.simopt = ''
  
 -        checktool('git', 'git')
 +        checktool('git', 'git', debname='git-core')
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1069,6 +1073,8 @@ class svn_sink(converter_sink, commandli
+@@ -1077,6 +1081,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
@@ -157,7 +157,7 @@
 -            raise util.Abort(_("SSL support is unavailable"))
 +            raise util.Abort(_("SSL support is unavailable") +
 +                             _(" (try installing the %s package)") % 'python-openssl')
-         ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
+         ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
          ctx.use_privatekey_file(ssl_cert)
          ctx.use_certificate_file(ssl_cert)
 @@ -248,7 +249,8 @@ class _httprequesthandlerssl(_httpreques
@@ -167,6 +167,6 @@
 -            raise util.Abort(_("SSL support is unavailable"))
 +            raise util.Abort(_("SSL support is unavailable") +
 +                             _(" (try installing the %s package)") % 'python-openssl')
-         httpserver.socket = ssl.wrap_socket(httpserver.socket, server_side=True,
-             certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv23)
- 
+         httpserver.socket = ssl.wrap_socket(
+             httpserver.socket, server_side=True,
+             certfile=ssl_cert, ssl_version=ssl.PROTOCOL_TLSv1)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-11-08 10:22:45 UTC (rev 11554)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-11-08 10:22:48 UTC (rev 11555)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2256,8 +2256,8 @@ def debuginstall(ui):
+@@ -2291,8 +2291,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -791,7 +791,7 @@ class ui(object):
+@@ -859,7 +859,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12019,8 +12019,8 @@ msgstr " (テンプレートのインス
+@@ -12242,8 +12242,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -18904,11 +18904,12 @@ msgstr ""
+@@ -19492,11 +19492,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20111,7 +20112,7 @@ msgid ""
+@@ -20706,7 +20707,7 @@ 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"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -20119,7 +20120,7 @@ msgstr ""
+@@ -20714,7 +20715,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12213,10 +12213,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12441,10 +12441,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -19275,10 +19275,12 @@ msgstr ""
+@@ -19889,10 +19889,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20513,7 +20515,7 @@ msgid ""
+@@ -21134,7 +21136,7 @@ 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"
@@ -253,7 +253,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -20521,7 +20523,7 @@ msgstr ""
+@@ -21142,7 +21144,7 @@ msgstr ""
  "    mensagens de consolidação. O editor usado é determinado pela\n"
  "    consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
  "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -349,7 +349,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
-@@ -1250,7 +1250,8 @@ User interface controls.
+@@ -1317,7 +1317,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -12441,8 +12441,8 @@ msgstr " (шаблоны, похоже,
+@@ -12451,8 +12451,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"
-@@ -19430,10 +19430,12 @@ msgstr ""
+@@ -19448,10 +19448,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20651,14 +20653,14 @@ msgid ""
+@@ -20669,14 +20671,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	2014-11-08 10:22:45 UTC (rev 11554)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-11-08 10:22:48 UTC (rev 11555)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1635,7 +1635,7 @@ class TestRunner(object):
+@@ -1776,7 +1776,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try:

More information about the Python-apps-commits mailing list