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

[vicho at users.alioth.debian.org]

    Date: Sunday, September 16, 2012 @ 11:48:03
  Author: vicho
Revision: 9120

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2012-09-16 11:44:38 UTC (rev 9119)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2012-09-16 11:48:03 UTC (rev 9120)
@@ -26,7 +26,7 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -29,11 +29,12 @@ def decodeargs(s):
+@@ -28,11 +28,12 @@ def decodeargs(s):
  class MissingTool(Exception):
      pass
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-09-16 11:44:38 UTC (rev 9119)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-09-16 11:48:03 UTC (rev 9120)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2023,8 +2023,8 @@ def debuginstall(ui):
+@@ -2030,8 +2030,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -67,8 +67,8 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -10624,8 +10624,8 @@ msgstr "(Vorlagen scheinen falsch instal
- msgid "Checking commit editor...\n"
+@@ -10755,8 +10755,8 @@ msgstr "(Vorlagen scheinen falsch instal
+ msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
@@ -78,7 +78,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -15957,7 +15957,8 @@ msgstr ""
+@@ -16054,7 +16054,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -88,7 +88,7 @@
  msgstr ""
  
  msgid ""
-@@ -16733,7 +16734,7 @@ msgid ""
+@@ -16836,7 +16837,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,9 +97,9 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -16742,7 +16743,7 @@ msgstr ""
- "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
- "ermittelt.\n"
+@@ -16844,7 +16845,7 @@ msgstr ""
+ "    geschrieben wird. Der verwendete Editor wird aus den drei Umgebungs-\n"
+ "    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."
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11170,8 +11170,8 @@ msgstr " (テンプレートのインス
+@@ -11196,8 +11196,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"
-@@ -17457,11 +17457,12 @@ msgstr ""
+@@ -17483,11 +17483,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18497,7 +18498,7 @@ msgid ""
+@@ -18532,7 +18533,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"
-@@ -18505,7 +18506,7 @@ msgstr ""
+@@ -18540,7 +18541,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11325,10 +11325,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11358,10 +11358,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 ""
-@@ -17774,10 +17774,12 @@ msgstr ""
+@@ -17812,10 +17812,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18843,7 +18845,7 @@ msgid ""
+@@ -18890,7 +18892,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"
-@@ -18851,7 +18853,7 @@ msgstr ""
+@@ -18898,7 +18900,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
-@@ -11555,8 +11555,8 @@ msgstr " (шаблоны, похоже,
+@@ -11584,8 +11584,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"
-@@ -17913,10 +17913,12 @@ msgstr ""
+@@ -17942,10 +17942,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18964,14 +18966,14 @@ msgid ""
+@@ -19003,14 +19005,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"