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

[vicho at users.alioth.debian.org]

    Date: Sunday, February 9, 2014 @ 17:38:34
  Author: vicho
Revision: 10500

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-02-09 17:38:25 UTC (rev 10499)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch	2014-02-09 17:38:34 UTC (rev 10500)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -131,9 +131,11 @@ def loaddoc(topic):
+@@ -132,9 +132,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-02-09 17:38:25 UTC (rev 10499)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-02-09 17:38:34 UTC (rev 10500)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2095,8 +2095,8 @@ def debuginstall(ui):
+@@ -2119,8 +2119,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -755,7 +755,7 @@ class ui(object):
+@@ -767,7 +767,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -67,19 +67,19 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -13738,8 +13738,8 @@ msgid "checking commit editor...\n"
+@@ -11680,8 +11680,8 @@ msgstr " (Vorlagen scheinen falsch insta
+ msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
- #: mercurial/commands.py:2093
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Kein Editor für Versionsmeldungen angegeben und vi nicht im PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
  
- #: mercurial/commands.py:2094 mercurial/commands.py:2098
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -20474,7 +20474,8 @@ msgstr ""
- #: mercurial/help/config.txt:1156
+ msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
+@@ -17233,7 +17233,8 @@ msgstr ""
+ 
  msgid ""
  "``editor``\n"
 -"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
@@ -87,8 +87,8 @@
 +"    ``sensible-editor``."
  msgstr ""
  
- #: mercurial/help/config.txt:1159
-@@ -21471,7 +21472,7 @@ msgid ""
+ msgid ""
+@@ -18111,7 +18112,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"
@@ -97,15 +97,15 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -21480,7 +21481,7 @@ msgstr ""
+@@ -18120,7 +18121,7 @@ msgstr ""
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
 -"    wird die Voreinstellung 'vi' verwendet."
 +"    wird die Voreinstellung 'sensible-editor' verwendet."
  
- #: mercurial/help/environment.txt:99
  msgid ""
+ "PYTHONPATH\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
 @@ -274,7 +274,7 @@ msgid ""
@@ -153,9 +153,9 @@
  msgstr "Sto controllando l'editor per il commit...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
--msgstr "Nessun editor per il commit trovato e non trovo vi in PATH\n"
+-msgstr " Nessun editor per il commit trovato e non trovo vi in PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr "Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n"
++msgstr " Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11954,8 +11954,8 @@ msgstr " (テンプレートのインス
+@@ -12007,8 +12007,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"
-@@ -18499,11 +18499,12 @@ msgstr ""
+@@ -18554,11 +18554,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -190,13 +190,13 @@
 +"    ``sensible-editor``."
  msgstr ""
  "``editor``\n"
- "    コミットログ入力用エディタ。 ç„¡æŒ‡å®šã®å ´åˆã€ ``$EDITOR`` ないし\n"
+ "    コミットログ入力用エディタ。 ç„¡æŒ‡å®šã®å ´åˆã€ ``$EDITOR`` または\n"
 -"    ``vi`` が使用されます。"
 +"    ``sensible-editor`` が使用されます。"
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19662,7 +19663,7 @@ msgid ""
+@@ -19717,7 +19718,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"
-@@ -19670,7 +19671,7 @@ msgstr ""
+@@ -19725,7 +19726,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12122,10 +12122,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12184,10 +12184,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 ""
-@@ -18837,10 +18837,12 @@ msgstr ""
+@@ -18900,10 +18900,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20030,7 +20032,7 @@ msgid ""
+@@ -20093,7 +20095,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"
-@@ -20038,7 +20040,7 @@ msgstr ""
+@@ -20101,7 +20103,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"
@@ -275,7 +275,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
-@@ -14852,7 +14852,8 @@ msgstr ""
+@@ -14851,7 +14851,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -285,7 +285,7 @@
  msgstr ""
  
  msgid ""
-@@ -15564,7 +15565,7 @@ msgid ""
+@@ -15563,7 +15564,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"
@@ -321,12 +321,12 @@
  msgstr "檢查提交訊息編輯器...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
--msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n"
+-msgstr " 沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有sensible-editor\n"
++msgstr " 沒有設定提交訊息編輯器,然後在PATH中也沒有sensible-editor\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr "(åœ¨ä½ çš„è¨­å®šæª”æŒ‡æ˜Žä¸€å€‹ç”¨ä¾†ç·¨è¼¯æäº¤è¨Šæ¯çš„ç·¨è¼¯å™¨)\n"
+ msgstr " (åœ¨ä½ çš„è¨­å®šæª”æŒ‡æ˜Žä¸€å€‹ç”¨ä¾†ç·¨è¼¯æäº¤è¨Šæ¯çš„ç·¨è¼¯å™¨)\n"
 @@ -9710,7 +9710,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\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
-@@ -1154,7 +1154,8 @@ User interface controls.
+@@ -1166,7 +1166,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
-@@ -12019,8 +12019,8 @@ msgstr " (шаблоны, похоже,
+@@ -12021,8 +12021,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"
-@@ -18656,10 +18656,12 @@ msgstr ""
+@@ -18659,10 +18659,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19832,14 +19834,14 @@ msgid ""
+@@ -19835,14 +19837,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-02-09 17:38:25 UTC (rev 10499)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-02-09 17:38:34 UTC (rev 10500)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -430,7 +430,7 @@ def usecorrectpython():
+@@ -436,7 +436,7 @@ def usecorrectpython():
               sys.executable)
          mypython = os.path.join(BINDIR, pyexename)
          try: