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

Tue May 11 09:08:04 UTC 2010

Date: Tuesday, May 11, 2010 @ 09:07:56
  Author: vdanjean
Revision: 5208

Refreshing patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch
  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-05-11 08:27:05 UTC (rev 5207)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies	2010-05-11 09:07:56 UTC (rev 5208)
@@ -14,12 +14,12 @@
          raise util.Abort(_('hook type %s does not pass a changeset id') %
 --- a/hgext/convert/bzr.py
 +++ b/hgext/convert/bzr.py
-@@ -43,7 +43,8 @@
+@@ -44,7 +44,8 @@
              # access bzrlib stuff
              branch
          except NameError:
--            raise NoRepo('Bazaar modules could not be loaded')
-+            raise NoRepo('Bazaar modules could not be loaded' +
+-            raise NoRepo(_('Bazaar modules could not be loaded'))
++            raise NoRepo(_('Bazaar modules could not be loaded') +
 +                         _(' (try installing the %s package)') % 'bzr')
  
          path = os.path.abspath(path)
@@ -45,7 +45,7 @@
 +++ b/hgext/convert/cvs.py
 @@ -21,7 +21,7 @@
          if not os.path.exists(cvs):
-             raise NoRepo("%s does not look like a CVS checkout" % path)
+             raise NoRepo(_("%s does not look like a CVS checkout") % path)
  
 -        checktool('cvs')
 +        checktool('cvs', debname='cvs')
@@ -56,7 +56,7 @@
 +++ b/hgext/convert/darcs.py
 @@ -39,14 +39,15 @@
          if not os.path.exists(os.path.join(path, '_darcs')):
-             raise NoRepo("%s does not look like a darcs repo" % path)
+             raise NoRepo(_("%s does not look like a darcs repository") % path)
  
 -        checktool('darcs')
 +        checktool('darcs', debname='darcs')
@@ -74,9 +74,9 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -37,7 +37,7 @@
+@@ -43,7 +43,7 @@
          if not os.path.exists(path + "/objects"):
-             raise NoRepo("%s does not look like a Git repo" % path)
+             raise NoRepo(_("%s does not look like a Git repository") % path)
  
 -        checktool('git', 'git')
 +        checktool('git', 'git', debname='git-core')
@@ -85,7 +85,7 @@
  
 --- a/hgext/convert/gnuarch.py
 +++ b/hgext/convert/gnuarch.py
-@@ -41,7 +41,8 @@
+@@ -42,7 +42,8 @@
              if util.find_exe('tla'):
                  self.execmd = 'tla'
              else:
@@ -97,7 +97,7 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
          self.files = None
          self.dirs  = None
  
@@ -116,7 +116,7 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -212,16 +213,19 @@
+@@ -213,16 +214,19 @@
          try:
              SubversionException
          except NameError:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -964,6 +968,9 @@
+@@ -966,6 +970,9 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

Modified: packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch	2010-05-11 08:27:05 UTC (rev 5207)
+++ packages/mercurial/trunk/debian/patches/deb_specific__python-module-not-script.patch	2010-05-11 09:07:56 UTC (rev 5208)
@@ -2,20 +2,16 @@
 Upstream do not want to apply this patch because these files come from
 another place and they do not want to modify them.
 
-Index: mercurial-git/mercurial/lsprof.py
-===================================================================
---- mercurial-git.orig/mercurial/lsprof.py	2008-04-06 20:12:23.000000000 +0200
-+++ mercurial-git/mercurial/lsprof.py	2008-04-06 20:15:46.000000000 +0200
+--- a/mercurial/lsprof.py
++++ b/mercurial/lsprof.py
 @@ -1,5 +1,3 @@
 -#! /usr/bin/env python
 -
  import sys
  from _lsprof import Profiler, profiler_entry
  
-Index: mercurial-git/mercurial/simplemerge.py
-===================================================================
---- mercurial-git.orig/mercurial/simplemerge.py	2008-04-06 20:12:00.000000000 +0200
-+++ mercurial-git/mercurial/simplemerge.py	2008-04-06 20:12:02.000000000 +0200
+--- a/mercurial/simplemerge.py
++++ b/mercurial/simplemerge.py
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env python
  # Copyright (C) 2004, 2005 Canonical Ltd

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-05-11 08:27:05 UTC (rev 5207)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2010-05-11 09:07:56 UTC (rev 5208)
@@ -2,7 +2,7 @@
 
 --- a/doc/hgrc.5.txt
 +++ b/doc/hgrc.5.txt
-@@ -763,7 +763,8 @@
+@@ -768,7 +768,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
-@@ -5701,7 +5701,7 @@
+@@ -5750,7 +5750,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -58,7 +58,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8363,7 +8363,7 @@
+@@ -8423,7 +8423,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
-@@ -7259,10 +7259,10 @@
+@@ -7323,10 +7323,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"
-@@ -10309,7 +10309,7 @@
+@@ -10391,7 +10391,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"
-@@ -10401,7 +10401,7 @@
+@@ -10483,7 +10483,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
-@@ -5454,7 +5454,7 @@
+@@ -5459,7 +5459,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -226,7 +226,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8359,7 +8359,7 @@
+@@ -8373,7 +8373,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"


