[Python-apps-commits] r8840 - in packages/mercurial/branches/squeeze-backports/debian (2 files)

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Mon Jun 4 19:08:51 UTC 2012 

    Date: Monday, June 4, 2012 @ 19:08:48
  Author: vicho
Revision: 8840

Revert 8825:8824

Modified:
  packages/mercurial/branches/squeeze-backports/debian/changelog
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/branches/squeeze-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/changelog	2012-06-04 17:34:28 UTC (rev 8839)
+++ packages/mercurial/branches/squeeze-backports/debian/changelog	2012-06-04 19:08:48 UTC (rev 8840)
@@ -1,9 +1,3 @@
-mercurial (2.2.2-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Javi Merino <vicho at debian.org>  Sun, 03 Jun 2012 09:17:36 +0100
-
 mercurial (2.2.1-2) unstable; urgency=low
 
   * Blacklist test-convert-git.t as it is known to fail with git 1.7.10

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch	2012-06-04 17:34:28 UTC (rev 8839)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch	2012-06-04 19:08:48 UTC (rev 8840)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1970,8 +1970,8 @@ def debuginstall(ui):
+@@ -1966,8 +1966,8 @@
      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
-@@ -693,7 +693,7 @@ class ui(object):
+@@ -693,7 +693,7 @@
              # avoid confusion.
              editor = 'E'
          else:
@@ -37,7 +37,7 @@
                  os.environ.get("VISUAL") or
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -8752,7 +8752,7 @@ msgstr ""
+@@ -8752,7 +8752,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -46,7 +46,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13521,7 +13521,8 @@ msgstr ""
+@@ -13521,7 +13521,8 @@
  
  msgid ""
  "``editor``\n"
@@ -56,7 +56,7 @@
  msgstr ""
  
  msgid ""
-@@ -14194,7 +14195,7 @@ msgid ""
+@@ -14194,7 +14195,7 @@
  "    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"
@@ -67,7 +67,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -10140,8 +10140,8 @@ msgstr "(Vorlagen scheinen falsch instal
+@@ -10140,8 +10140,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\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"
-@@ -15292,7 +15292,8 @@ msgstr ""
+@@ -15292,7 +15292,8 @@
  
  msgid ""
  "``editor``\n"
@@ -88,7 +88,7 @@
  msgstr ""
  
  msgid ""
-@@ -16050,7 +16051,7 @@ msgid ""
+@@ -16050,7 +16051,7 @@
  "    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,7 +97,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -16059,7 +16060,7 @@ msgstr ""
+@@ -16059,7 +16060,7 @@
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind, wird\n"
@@ -108,7 +108,7 @@
  "PYTHONPATH\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
-@@ -274,7 +274,7 @@ msgid ""
+@@ -274,7 +274,7 @@
  "    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"
@@ -117,7 +117,7 @@
  msgstr ""
  
  msgid ""
-@@ -11500,7 +11500,7 @@ msgstr ""
+@@ -11500,7 +11500,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -128,7 +128,7 @@
  msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/fr.po
 +++ b/i18n/fr.po
-@@ -299,7 +299,7 @@ msgid ""
+@@ -299,7 +299,7 @@
  "    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"
@@ -137,7 +137,7 @@
  msgstr ""
  
  msgid ""
-@@ -8228,7 +8228,7 @@ msgstr ""
+@@ -8228,7 +8228,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -148,7 +148,7 @@
  msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/it.po
 +++ b/i18n/it.po
-@@ -7157,8 +7157,8 @@ msgstr ""
+@@ -7157,8 +7157,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Sto controllando l'editor per il commit...\n"
  
@@ -159,7 +159,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -10462,7 +10462,7 @@ msgid ""
+@@ -10462,7 +10462,7 @@
  "    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"
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -10595,8 +10595,8 @@ msgstr " (テンプレートのインス
+@@ -10602,8 +10602,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -16815,11 +16815,12 @@ msgstr ""
+@@ -16823,11 +16823,12 @@
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -17841,7 +17842,7 @@ msgid ""
+@@ -17832,7 +17833,7 @@
  "    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"
-@@ -17849,7 +17850,7 @@ msgstr ""
+@@ -17840,7 +17841,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -10745,10 +10745,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -10753,10 +10753,10 @@
  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 ""
-@@ -17119,10 +17119,12 @@ msgstr ""
+@@ -17128,10 +17128,12 @@
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18174,7 +18176,7 @@ msgid ""
+@@ -18162,7 +18164,7 @@
  "    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"
-@@ -18182,7 +18184,7 @@ msgstr ""
+@@ -18170,7 +18172,7 @@
  "    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"
@@ -264,7 +264,7 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -8717,8 +8717,8 @@ msgstr " (mallar verkar vara inkorrekt i
+@@ -8717,8 +8717,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Kontrollerar arkiveringseditor...\n"
  
@@ -275,7 +275,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
-@@ -13794,7 +13794,8 @@ msgstr ""
+@@ -13794,7 +13794,8 @@
  
  msgid ""
  "``editor``\n"
@@ -285,7 +285,7 @@
  msgstr ""
  
  msgid ""
-@@ -14477,7 +14478,7 @@ msgid ""
+@@ -14477,7 +14478,7 @@
  "    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"
@@ -296,7 +296,7 @@
  msgid ""
 --- a/i18n/zh_CN.po
 +++ b/i18n/zh_CN.po
-@@ -5880,7 +5880,7 @@ msgstr ""
+@@ -5880,7 +5880,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -305,7 +305,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8768,7 +8768,7 @@ msgid ""
+@@ -8768,7 +8768,7 @@
  "    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"
@@ -316,7 +316,7 @@
  msgid ""
 --- a/i18n/zh_TW.po
 +++ b/i18n/zh_TW.po
-@@ -6760,8 +6760,8 @@ msgstr ""
+@@ -6760,8 +6760,8 @@
  msgid "Checking commit editor...\n"
  msgstr "檢查提交訊息編輯器...\n"
  
@@ -327,7 +327,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr "(在你的設定檔指明一個用來編輯提交訊息的編輯器)\n"
-@@ -9710,7 +9710,7 @@ msgid ""
+@@ -9710,7 +9710,7 @@
  "    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"
@@ -338,7 +338,7 @@
  msgid ""
 --- a/mercurial/help/environment.txt
 +++ b/mercurial/help/environment.txt
-@@ -94,7 +94,7 @@ EDITOR
+@@ -94,7 +94,7 @@
      editor it uses is determined by looking at the environment
      variables HGEDITOR, VISUAL and EDITOR, in that order. The first
      non-empty one is chosen. If all of them are empty, the editor
@@ -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
-@@ -1121,7 +1121,8 @@ User interface controls.
+@@ -1123,7 +1123,8 @@
      Print debugging information. True or False. Default is False.
  
  ``editor``
@@ -361,7 +361,7 @@
      Encoding to try if it's not possible to decode the changelog using
 --- a/i18n/ro.po
 +++ b/i18n/ro.po
-@@ -7722,7 +7722,7 @@ msgstr ""
+@@ -7722,7 +7722,7 @@
  msgid "Checking commit editor...\n"
  msgstr "Se verifică editorul pentru commit...\n"
  
@@ -370,7 +370,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -11925,7 +11925,8 @@ msgstr ""
+@@ -11925,7 +11925,8 @@
  
  msgid ""
  "``editor``\n"
@@ -380,7 +380,7 @@
  msgstr ""
  
  msgid ""
-@@ -12570,7 +12571,7 @@ msgid ""
+@@ -12570,7 +12571,7 @@
  "    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"
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -10969,8 +10969,8 @@ msgstr " (шаблоны, похоже,
+@@ -10573,8 +10573,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Проверка редактора сообщений фиксации...\n"
  
@@ -402,7 +402,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (задайте редактор сообщений в вашем конфиге)\n"
-@@ -17256,10 +17256,12 @@ msgstr ""
+@@ -16647,10 +16647,12 @@
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18290,14 +18292,14 @@ msgid ""
+@@ -17652,14 +17654,14 @@
  "    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"

More information about the Python-apps-commits mailing list