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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Tue May 14 16:41:47 UTC 2013 

    Date: Tuesday, May 14, 2013 @ 16:41:46
  Author: vicho
Revision: 9645

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.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__optional-dependencies
  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	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch	2013-05-14 16:41:46 UTC (rev 9645)
@@ -12,7 +12,7 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -411,7 +411,6 @@ cmdclass = {'build': hgbuild,
+@@ -413,7 +413,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,

Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch	2013-05-14 16:41:46 UTC (rev 9645)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -312,7 +312,7 @@ def view(ui, repo, *etc, **opts):
+@@ -313,7 +313,7 @@ def view(ui, repo, *etc, **opts):
      "start interactive history viewer"
      os.chdir(repo.root)
      optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2013-05-14 16:41:46 UTC (rev 9645)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -469,8 +469,7 @@ if sys.platform.startswith('linux') and
+@@ -472,8 +472,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
-@@ -129,9 +129,11 @@ def loaddoc(topic):
+@@ -130,9 +130,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	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch	2013-05-14 16:41:46 UTC (rev 9645)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -469,7 +469,7 @@ if sys.platform.startswith('linux') and
+@@ -472,7 +472,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	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2013-05-14 16:41:46 UTC (rev 9645)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -294,7 +294,7 @@ funcs = {
+@@ -323,7 +323,7 @@ funcs = {
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -475,14 +475,6 @@ packagedata = {'mercurial': ['locale/*/L
+@@ -478,14 +478,6 @@ packagedata = {'mercurial': ['locale/*/L
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2013-05-14 16:41:46 UTC (rev 9645)
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -64,7 +64,7 @@ class convert_git(converter_source):
+@@ -79,7 +79,7 @@ class convert_git(converter_source):
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-05-14 16:41:03 UTC (rev 9644)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-05-14 16:41:46 UTC (rev 9645)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2061,8 +2061,8 @@ def debuginstall(ui):
+@@ -2039,8 +2039,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
-@@ -701,7 +701,7 @@ class ui(object):
+@@ -753,7 +753,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -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 ""
+@@ -7156,8 +7156,8 @@ msgstr ""
  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 ""
+@@ -10461,7 +10461,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"
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11335,8 +11335,8 @@ msgstr " (テンプレートのインス
+@@ -11520,8 +11520,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"
-@@ -17739,11 +17739,12 @@ msgstr ""
+@@ -18032,11 +18032,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18797,7 +18798,7 @@ msgid ""
+@@ -19179,7 +19180,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"
-@@ -18805,7 +18806,7 @@ msgstr ""
+@@ -19187,7 +19188,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11497,10 +11497,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11685,10 +11685,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 ""
-@@ -18086,10 +18086,12 @@ msgstr ""
+@@ -18377,10 +18377,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19173,7 +19175,7 @@ msgid ""
+@@ -19570,7 +19572,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"
-@@ -19181,7 +19183,7 @@ msgstr ""
+@@ -19578,7 +19580,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
-@@ -1137,7 +1137,8 @@ User interface controls.
+@@ -1151,7 +1151,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``

More information about the Python-apps-commits mailing list