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

[vicho-guest at users.alioth.debian.org]

    Date: Wednesday, June 16, 2010 @ 08:21:10
  Author: vicho-guest
Revision: 5413

Refreshed debian patches

Modified:
  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__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-06-16 08:20:54 UTC (rev 5412)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-06-16 08:21:10 UTC (rev 5413)
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -966,6 +970,9 @@
+@@ -970,6 +974,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-06-16 08:20:54 UTC (rev 5412)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-06-16 08:21:10 UTC (rev 5413)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -768,7 +768,8 @@
+@@ -808,7 +808,8 @@
  ``debug``
      Print debugging information. True or False. Default is False.
  ``editor``
@@ -49,7 +49,7 @@
          '''show a progress message
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -5750,7 +5750,7 @@
+@@ -5817,7 +5817,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -58,7 +58,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8423,7 +8423,7 @@
+@@ -8518,7 +8518,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"
@@ -184,7 +184,7 @@
  "    Mercurial ãŒå½“è©²ã‚·ã‚¹ãƒ†ãƒ ã®å…±æœ‰é ˜åŸŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã€\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -7323,10 +7323,10 @@
+@@ -7487,10 +7487,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"
-@@ -10391,7 +10391,7 @@
+@@ -10583,7 +10583,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"
-@@ -10483,7 +10483,7 @@
+@@ -10675,7 +10675,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"