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

[vicho at users.alioth.debian.org]

    Date: Thursday, February 11, 2016 @ 21:58:35
  Author: vicho
Revision: 12779

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__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-02-11 21:57:53 UTC (rev 12778)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2016-02-11 21:58:35 UTC (rev 12779)
@@ -11,8 +11,8 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -475,7 +475,6 @@ cmdclass = {'build': hgbuild,
-             'build_py': hgbuildpy,
+@@ -531,7 +531,6 @@ cmdclass = {'build': hgbuild,
+             'build_scripts': hgbuildscripts,
              'build_hgextindex': buildhgextindex,
              'install_lib': hginstalllib,
 -            'install_scripts': hginstallscripts,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2016-02-11 21:57:53 UTC (rev 12778)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch	2016-02-11 21:58:35 UTC (rev 12779)
@@ -9,8 +9,8 @@
 
 --- a/mercurial/util.py
 +++ b/mercurial/util.py
-@@ -700,6 +700,8 @@ def mainfrozen():
- if mainfrozen():
+@@ -886,6 +886,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)
 +elif __file__.startswith("/usr/lib/python"):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2016-02-11 21:57:53 UTC (rev 12778)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2016-02-11 21:58:35 UTC (rev 12779)
@@ -153,17 +153,7 @@
          commandline.__init__(self, ui, 'svn')
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -208,7 +208,8 @@ class _httprequesthandleropenssl(_httpre
-             import OpenSSL
-             OpenSSL.SSL.Context
-         except ImportError:
--            raise error.Abort(_("SSL support is unavailable"))
-+            raise error.Abort(_("SSL support is unavailable") +
-+                              _(" (try installing the %s package)") % 'python-openssl')
-         ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
-         ctx.use_privatekey_file(ssl_cert)
-         ctx.use_certificate_file(ssl_cert)
-@@ -249,7 +250,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -225,7 +225,8 @@ class _httprequesthandlerssl(_httpreques
              import ssl
              ssl.wrap_socket
          except ImportError:

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-02-11 21:57:53 UTC (rev 12778)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-02-11 21:58:35 UTC (rev 12779)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2471,8 +2471,8 @@ def debuginstall(ui):
+@@ -2724,8 +2724,8 @@ def debuginstall(ui):
      editor = util.expandpath(editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -914,7 +914,7 @@ class ui(object):
+@@ -981,7 +981,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -13073,8 +13073,8 @@ msgstr " (テンプレートのインス
+@@ -13595,8 +13595,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"
-@@ -21031,10 +21031,12 @@ msgstr ""
+@@ -21910,10 +21910,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -22333,7 +22335,7 @@ msgid ""
+@@ -23299,7 +23301,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"
-@@ -22341,7 +22343,7 @@ msgstr ""
+@@ -23307,7 +23309,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -13233,10 +13233,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -13805,10 +13805,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 ""
-@@ -21414,11 +21414,12 @@ msgstr ""
+@@ -22392,11 +22392,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -22772,7 +22773,7 @@ msgid ""
+@@ -23861,7 +23862,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"
-@@ -22780,7 +22781,7 @@ msgstr ""
+@@ -23869,7 +23870,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
-@@ -1440,7 +1440,8 @@ User interface controls.
+@@ -1566,7 +1566,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-02-11 21:57:53 UTC (rev 12778)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2016-02-11 21:58:35 UTC (rev 12779)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -2006,7 +2006,7 @@ class TestRunner(object):
+@@ -2143,7 +2143,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try: