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

[vdanjean at users.alioth.debian.org]

    Date: Saturday, April 10, 2010 @ 08:01:55
  Author: vdanjean
Revision: 5097

Refresh debian patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  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__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2010-04-09 20:09:09 UTC (rev 5096)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2010-04-10 08:01:55 UTC (rev 5097)
@@ -18,7 +18,7 @@
          path = os.path.join(docdir, topic + ".txt")
 --- a/setup.py
 +++ b/setup.py
-@@ -257,8 +257,7 @@
+@@ -263,8 +263,7 @@
                                       ['hgext/inotify/linux/_inotify.c']))
          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	2010-04-09 20:09:09 UTC (rev 5096)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately	2010-04-10 08:01:55 UTC (rev 5097)
@@ -13,7 +13,7 @@
  def parsestring(s, quoted=True):
 --- a/setup.py
 +++ b/setup.py
-@@ -263,14 +263,6 @@
+@@ -269,14 +269,6 @@
  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	2010-04-09 20:09:09 UTC (rev 5096)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-04-10 08:01:55 UTC (rev 5097)
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -961,6 +965,9 @@
+@@ -964,6 +968,9 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-04-09 20:09:09 UTC (rev 5096)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-04-10 08:01:55 UTC (rev 5097)
@@ -25,7 +25,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1050,8 +1050,8 @@
+@@ -1054,8 +1054,8 @@
      editor = ui.geteditor()
      cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
      if not cmdpath:
@@ -184,7 +184,7 @@
  "    Mercurial ãŒå½“è©²ã‚·ã‚¹ãƒ†ãƒ ã®å…±æœ‰é ˜åŸŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã€\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -7148,10 +7148,10 @@
+@@ -7259,10 +7259,10 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -197,7 +197,7 @@
  
  msgid " (specify a commit editor in your .hgrc file)\n"
  msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n"
-@@ -10198,7 +10198,7 @@
+@@ -10309,7 +10309,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"
@@ -206,7 +206,7 @@
  "\n"
  "PYTHONPATH\n"
  "    This is used by Python to find imported modules and may need to be\n"
-@@ -10290,7 +10290,7 @@
+@@ -10401,7 +10401,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"
@@ -217,7 +217,7 @@
  "    Isto é usado pelo Python para localizar módulos importados, e\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -5357,7 +5357,7 @@
+@@ -5454,7 +5454,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -226,7 +226,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8262,7 +8262,7 @@
+@@ -8359,7 +8359,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"