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

[vicho at users.alioth.debian.org]

    Date: Sunday, February 8, 2015 @ 21:36:25
  Author: vicho
Revision: 11728

Refresh patches

Modified:
  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__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-02-08 21:36:20 UTC (rev 11727)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-02-08 21:36:25 UTC (rev 11728)
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12242,8 +12242,8 @@ msgstr " (テンプレートのインス
+@@ -12331,8 +12331,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"
-@@ -19492,11 +19492,12 @@ msgstr ""
+@@ -19627,11 +19627,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20706,7 +20707,7 @@ msgid ""
+@@ -20840,7 +20841,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"
-@@ -20714,7 +20715,7 @@ msgstr ""
+@@ -20848,7 +20849,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12441,10 +12441,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12532,10 +12532,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 ""
-@@ -19889,10 +19889,12 @@ msgstr ""
+@@ -20025,10 +20025,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -21134,7 +21136,7 @@ msgid ""
+@@ -21272,7 +21274,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"
-@@ -21142,7 +21144,7 @@ msgstr ""
+@@ -21280,7 +21282,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"

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	2015-02-08 21:36:20 UTC (rev 11727)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-02-08 21:36:25 UTC (rev 11728)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1798,7 +1798,7 @@ class TestRunner(object):
+@@ -1801,7 +1801,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try: