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

[vicho at users.alioth.debian.org]

    Date: Wednesday, September 3, 2014 @ 09:52:18
  Author: vicho
Revision: 11244

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.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__support_help_in_fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch	2014-09-03 09:52:16 UTC (rev 11243)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch	2014-09-03 09:52:18 UTC (rev 11244)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -133,9 +133,11 @@ def loaddoc(topic):
+@@ -134,9 +134,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-09-03 09:52:16 UTC (rev 11243)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-09-03 09:52:18 UTC (rev 11244)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2249,8 +2249,8 @@ def debuginstall(ui):
+@@ -2256,8 +2256,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12012,8 +12012,8 @@ msgstr " (テンプレートのインス
+@@ -12019,8 +12019,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"
-@@ -18886,11 +18886,12 @@ msgstr ""
+@@ -18904,11 +18904,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20093,7 +20094,7 @@ msgid ""
+@@ -20111,7 +20112,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"
-@@ -20101,7 +20102,7 @@ msgstr ""
+@@ -20119,7 +20120,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12199,10 +12199,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12206,10 +12206,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 ""
-@@ -19251,10 +19251,12 @@ msgstr ""
+@@ -19270,10 +19270,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20489,7 +20491,7 @@ msgid ""
+@@ -20508,7 +20510,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"
-@@ -20497,7 +20499,7 @@ msgstr ""
+@@ -20516,7 +20518,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"
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -12021,8 +12021,8 @@ msgstr " (шаблоны, похоже,
+@@ -12441,8 +12441,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"
-@@ -18659,10 +18659,12 @@ msgstr ""
+@@ -19430,10 +19430,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19835,14 +19837,14 @@ msgid ""
+@@ -20651,14 +20653,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-09-03 09:52:16 UTC (rev 11243)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-09-03 09:52:18 UTC (rev 11244)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1632,7 +1632,7 @@ class TestRunner(object):
+@@ -1635,7 +1635,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try: