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

[vicho at users.alioth.debian.org]

    Date: Tuesday, November 27, 2012 @ 21:47:47
  Author: vicho
Revision: 9271

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
  packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
  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	2012-11-27 21:47:41 UTC (rev 9270)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2012-11-27 21:47:47 UTC (rev 9271)
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -406,7 +406,6 @@ cmdclass = {'build': hgbuild,
+@@ -409,7 +409,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2012-11-27 21:47:41 UTC (rev 9270)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2012-11-27 21:47:47 UTC (rev 9271)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -463,8 +463,7 @@ if sys.platform.startswith('linux') and
+@@ -467,8 +467,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  
@@ -14,7 +14,7 @@
      return p and p[0] != '.' and p[-1] != '~'
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -124,9 +124,11 @@ def loaddoc(topic):
+@@ -129,9 +129,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2012-11-27 21:47:41 UTC (rev 9270)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2012-11-27 21:47:47 UTC (rev 9271)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -463,7 +463,7 @@ if sys.platform.startswith('linux') and
+@@ -467,7 +467,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2012-11-27 21:47:41 UTC (rev 9270)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2012-11-27 21:47:47 UTC (rev 9271)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -196,7 +196,7 @@ funcs = {
+@@ -278,7 +278,7 @@ funcs = {
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -469,14 +469,6 @@ packagedata = {'mercurial': ['locale/*/L
+@@ -473,14 +473,6 @@ packagedata = {'mercurial': ['locale/*/L
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-11-27 21:47:41 UTC (rev 9270)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-11-27 21:47:47 UTC (rev 9271)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2030,8 +2030,8 @@ def debuginstall(ui):
+@@ -2044,8 +2044,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11206,8 +11206,8 @@ msgstr " (テンプレートのインス
+@@ -11260,8 +11260,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"
-@@ -17498,11 +17498,12 @@ msgstr ""
+@@ -17595,11 +17595,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18547,7 +18548,7 @@ msgid ""
+@@ -18644,7 +18645,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"
-@@ -18555,7 +18556,7 @@ msgstr ""
+@@ -18652,7 +18653,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11358,10 +11358,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11432,10 +11432,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 ""
-@@ -17812,10 +17812,12 @@ msgstr ""
+@@ -17944,10 +17944,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18890,7 +18892,7 @@ msgid ""
+@@ -19022,7 +19024,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"
-@@ -18898,7 +18900,7 @@ msgstr ""
+@@ -19030,7 +19032,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"
@@ -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.
+@@ -1132,7 +1132,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``