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

[vicho at users.alioth.debian.org]

    Date: Sunday, August 7, 2016 @ 09:33:29
  Author: vicho
Revision: 13472

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.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	2016-08-07 09:33:07 UTC (rev 13471)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2016-08-07 09:33:29 UTC (rev 13472)
@@ -11,7 +11,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -526,7 +526,6 @@ cmdclass = {'build': hgbuild,
+@@ -534,7 +534,6 @@ cmdclass = {'build': hgbuild,
              'build_scripts': hgbuildscripts,
              'build_hgextindex': buildhgextindex,
              'install_lib': hginstalllib,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2016-08-07 09:33:07 UTC (rev 13471)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2016-08-07 09:33:29 UTC (rev 13472)
@@ -9,7 +9,7 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -900,6 +900,8 @@ def mainfrozen():
+@@ -931,6 +931,8 @@ def mainfrozen():
  if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
      # executable version (py2exe) doesn't support __file__
      datapath = os.path.dirname(sys.executable)

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2016-08-07 09:33:07 UTC (rev 13471)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2016-08-07 09:33:29 UTC (rev 13472)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -330,6 +330,6 @@ def view(ui, repo, *etc, **opts):
+@@ -343,6 +343,6 @@ def view(ui, repo, *etc, **opts):
      if repo.filtername is None:
          optstr += '--hidden'
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2016-08-07 09:33:07 UTC (rev 13471)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2016-08-07 09:33:29 UTC (rev 13472)
@@ -2,7 +2,7 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -369,7 +369,8 @@ class bzmysql(bzaccess):
+@@ -370,7 +370,8 @@ class bzmysql(bzaccess):
              import MySQLdb as mysql
              bzmysql._MySQLdb = mysql
          except ImportError as err:
@@ -14,7 +14,7 @@
  
 --- a/hgext/convert/bzr.py
 +++ b/hgext/convert/bzr.py
-@@ -53,7 +53,8 @@ class bzr_source(common.converter_source
+@@ -54,7 +54,8 @@ class bzr_source(common.converter_source
              # access bzrlib stuff
              bzrdir
          except NameError:
@@ -77,7 +77,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -80,7 +80,7 @@ class convert_git(common.converter_sourc
+@@ -81,7 +81,7 @@ class convert_git(common.converter_sourc
          else:
              self.simopt = []
  
@@ -88,7 +88,7 @@
          self.submodules = []
 --- a/hgext/convert/gnuarch.py
 +++ b/hgext/convert/gnuarch.py
-@@ -50,7 +50,8 @@ class gnuarch_source(common.converter_so
+@@ -51,7 +51,8 @@ class gnuarch_source(common.converter_so
              if util.findexe('tla'):
                  self.execmd = 'tla'
              else:
@@ -146,12 +146,12 @@
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
 @@ -227,7 +227,8 @@ class _httprequesthandlerssl(_httpreques
-             import ssl
-             ssl.wrap_socket
+             from .. import sslutil
+             sslutil.modernssl
          except ImportError:
 -            raise error.Abort(_("SSL support is unavailable"))
 +            raise error.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_TLSv1)
+ 
+         certfile = ui.config('web', 'certificate')
+ 

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-08-07 09:33:07 UTC (rev 13471)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-08-07 09:33:29 UTC (rev 13472)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2792,15 +2792,15 @@ def debuginstall(ui, **opts):
+@@ -2803,15 +2803,15 @@ def debuginstall(ui, **opts):
      editor = util.expandpath(editor)
      fm.write('editor', _("checking commit editor... (%s)\n"), editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
@@ -35,7 +35,7 @@
      # check username
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -1056,7 +1056,7 @@ class ui(object):
+@@ -1074,7 +1074,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -179,19 +179,8 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -13602,8 +13602,8 @@ msgstr " (テンプレートのインス
- msgid "checking commit editor...\n"
- msgstr "メッセージ入力用エディタの確認中...\n"
+@@ -22799,10 +22799,12 @@ msgstr ""
  
--msgid " No commit editor set and can't find vi in PATH\n"
--msgstr " エディタが起動できません(vi にも PATH が通っていません)\n"
-+msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n"
- 
- msgid " (specify a commit editor in your configuration file)\n"
- msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -21925,10 +21925,12 @@ msgstr ""
- 
  msgid ""
  "``editor``\n"
 -"    The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)"
@@ -205,7 +194,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -23314,7 +23316,7 @@ msgid ""
+@@ -24222,7 +24224,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"
@@ -214,7 +203,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -23322,7 +23324,7 @@ msgstr ""
+@@ -24230,7 +24232,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -225,7 +214,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -22957,11 +22957,12 @@ msgstr ""
+@@ -23338,11 +23338,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -240,7 +229,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -24441,7 +24442,7 @@ msgid ""
+@@ -24841,7 +24842,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"
@@ -249,7 +238,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -24449,7 +24450,7 @@ msgstr ""
+@@ -24849,7 +24850,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"
@@ -258,7 +247,7 @@
  
  msgid ""
  "PYTHONPATH\n"
-@@ -33138,10 +33139,10 @@ msgstr "o número de cpus deve ser um in
+@@ -33962,10 +33963,10 @@ msgstr "o número de cpus deve ser um in
  #~ msgid " (check that you compiled the extensions)\n"
  #~ msgstr " (verifique se você compilou as extensões)\n"
  
@@ -358,7 +347,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
-@@ -1595,7 +1595,8 @@ User interface controls.
+@@ -1716,7 +1716,8 @@ User interface controls.
      Print debugging information. (default: False)
  
  ``editor``

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	2016-08-07 09:33:07 UTC (rev 13471)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2016-08-07 09:33:29 UTC (rev 13472)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -2286,7 +2286,7 @@ class TestRunner(object):
+@@ -2307,7 +2307,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try: