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

[vicho at users.alioth.debian.org]

    Date: Sunday, June 15, 2014 @ 20:29:27
  Author: vicho
Revision: 10960

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2014-06-15 20:25:36 UTC (rev 10959)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2014-06-15 20:29:27 UTC (rev 10960)
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -420,7 +420,6 @@ cmdclass = {'build': hgbuild,
+@@ -422,7 +422,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-06-15 20:25:36 UTC (rev 10959)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-06-15 20:29:27 UTC (rev 10960)
@@ -4,7 +4,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -494,7 +494,7 @@ funcs = {
+@@ -496,7 +496,7 @@ funcs = {
  
  # template engine
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-06-15 20:25:36 UTC (rev 10959)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2014-06-15 20:29:27 UTC (rev 10960)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2211,8 +2211,8 @@ def debuginstall(ui):
+@@ -2212,8 +2212,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
-@@ -786,7 +786,7 @@ class ui(object):
+@@ -791,7 +791,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12012,8 +12012,8 @@ msgstr " (テンプレートのインス
+@@ -11984,8 +11984,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"
-@@ -18566,11 +18566,12 @@ msgstr ""
+@@ -18605,11 +18605,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19729,7 +19730,7 @@ msgid ""
+@@ -19768,7 +19769,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"
-@@ -19737,7 +19738,7 @@ msgstr ""
+@@ -19776,7 +19777,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12187,10 +12187,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12162,10 +12162,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 ""
-@@ -18909,10 +18909,12 @@ msgstr ""
+@@ -18959,10 +18959,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20102,7 +20104,7 @@ msgid ""
+@@ -20152,7 +20154,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"
-@@ -20110,7 +20112,7 @@ msgstr ""
+@@ -20160,7 +20162,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"
@@ -316,7 +316,7 @@
  msgid ""
 --- a/i18n/zh_TW.po
 +++ b/i18n/zh_TW.po
-@@ -6760,8 +6760,8 @@ msgstr ""
+@@ -6759,8 +6759,8 @@ msgstr ""
  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 ""
+@@ -9709,7 +9709,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"