[Python-apps-commits] r9824 - in packages/mercurial/branches/wheezy-backports/debian (12 files)

[vicho at users.alioth.debian.org]

    Date: Tuesday, July 2, 2013 @ 20:55:18
  Author: vicho
Revision: 9824

Merge revisions 8825:9732 from trunk into wheezy-backports

Modified:
  packages/mercurial/branches/wheezy-backports/debian/changelog
  packages/mercurial/branches/wheezy-backports/debian/compat
  packages/mercurial/branches/wheezy-backports/debian/control
  packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-mo-fhs.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/wheezy-backports/debian/rules

Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog	2013-07-02 20:55:18 UTC (rev 9824)
@@ -1,3 +1,94 @@
+mercurial (2.6.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Delete patch
+    from_upstream__fix_untranslated_prompts_with_translated_responses.patch
+    which is now included upstream
+
+ -- Javi Merino <vicho at debian.org>  Sun, 09 Jun 2013 10:36:59 +0100
+
+mercurial (2.6.1-1) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Javi Merino ]
+  * New upstream release (Closes: #709815)
+  * Blacklist test-histedit-arguments.t and test-websub.t
+  * Fix "Translation missing for yes/no question, but requires translated
+    input from user" by adding patch
+    from_upstream__fix_untranslated_prompts_with_translated_responses.patch
+    (Closes: #707703)
+  * Upload to unstable
+
+ -- Javi Merino <vicho at debian.org>  Wed, 15 May 2013 22:16:29 +0100
+
+mercurial (2.5.2-1) experimental; urgency=low
+
+  * New upstream release
+  * Update hgview breaks.  hgview works with mercurial 2.5 starting from
+    1.7.1-1.
+  * test-convert-git.t works again so add it back to the test-suite we
+    run when building the package
+
+ -- Javi Merino <vicho at debian.org>  Tue, 19 Mar 2013 22:53:20 +0000
+
+mercurial (2.5.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Add test-obsolete.t to the blacklisted tests
+  * hgview 1.5.0-4 doesn't work with mercurial 2.5.1
+
+ -- Javi Merino <vicho at debian.org>  Tue, 12 Feb 2013 21:13:06 +0000
+
+mercurial (2.4.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Wed, 02 Jan 2013 13:01:27 +0100
+
+mercurial (2.4.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Wed, 19 Dec 2012 21:10:25 +0000
+
+mercurial (2.4-1) experimental; urgency=low
+
+  * New upstream release
+  * mercurial 2.3.1 was not compatible with hgsubversion 1.4 and
+    mercurial-git 0.3.3
+  * Bump standards-version to 3.9.4 (no change needed)
+  * Add test-commit-amend to the blacklisted tests as it needs styles
+    now
+
+ -- Javi Merino <vicho at debian.org>  Tue, 27 Nov 2012 22:35:33 +0000
+
+mercurial (2.3.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Delete patch for_upstream__hgweb_fix_spelling_error.patch which is
+    now included upstream
+
+ -- Javi Merino <vicho at debian.org>  Sun, 16 Sep 2012 16:05:55 +0100
+
+mercurial (2.3-2) experimental; urgency=low
+
+  * Blacklist test-histedit-revspec as it needs styles
+
+ -- Javi Merino <vicho at debian.org>  Sat, 04 Aug 2012 20:56:38 +0200
+
+mercurial (2.3-1) experimental; urgency=low
+
+  * Don't run the testsuite if nocheck is in DEB_BUILD_OPTIONS
+  * Move to dh v9 to automatically get the Hardening buildflags
+  * Don't Suggest xxdiff, as it's been removed from the archive
+  * New upstream release
+  * Add patch for_upstream__hgweb_fix_spelling_error.patch to fix a
+    spelling error in a manpage
+
+ -- Javi Merino <vicho at debian.org>  Fri, 03 Aug 2012 20:53:44 +0200
+
 mercurial (2.2.2-3) unstable; urgency=low
 
   * Fix "Backport improvement to vimdiff configuration" by adding

Modified: packages/mercurial/branches/wheezy-backports/debian/compat
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/compat	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/compat	2013-07-02 20:55:18 UTC (rev 9824)
@@ -1 +1 @@
-8
+9

Modified: packages/mercurial/branches/wheezy-backports/debian/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/control	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/control	2013-07-02 20:55:18 UTC (rev 9824)
@@ -4,7 +4,7 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean at debian.org>,
  Javi Merino <vicho at debian.org>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9),
  patchutils (>= 0.2.25),
  gettext,
  python-all-dev (>= 2.6.6-3~),
@@ -12,10 +12,10 @@
  python-roman,
  zip,
  unzip
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://mercurial.selenic.com/
-Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
 X-Python-Version: >= 2.4
 
 Package: mercurial-common
@@ -43,8 +43,8 @@
 Suggests: qct, 
  wish, 
  vim | emacs,
- kdiff3 | kdiff3-qt | kompare | meld | xxdiff | tkcvs | mgdiff
-Breaks: hgsubversion (<< 1.3), hgview (<< 1.3.0-2~), mercurial-git (<< 0.3.1), qct (<< 1.7-2~)
+ kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
+Breaks: hgsubversion (<= 1.4), hgview (<< 1.7.1-1~), mercurial-git (<= 0.3.3), qct (<< 1.7-2~)
 Description: easy-to-use, scalable distributed version control system
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2013-07-02 20:55:18 UTC (rev 9824)
@@ -22,15 +22,20 @@
 test-mq-qimport.t
 test-newcgi.t
 test-newercgi.t
+test-obsolete.t
 test-oldcgi.t
 test-serve.t
 test-share.t
 test-subrepo-relative-path.t
+test-websub.t
 
 # Failed to locate styles (?)
 test-bisect3.t
 test-command-template.t
+test-commit-amend.t
 test-glog.t
+test-histedit-arguments.t
+test-histedit-revspec.t
 test-install.t
 test-log.t
 test-tag.t
@@ -46,8 +51,3 @@
 
 # I'm missing some locales or something (?)
 test-i18n.t
-
-# test-convert-git.t fails with git 1.7.10
-# (http://mercurial.selenic.com/bts/issue3427) and some buildds (such
-# as ancina) have git installed and run this test
-test-convert-git.t

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2013-07-02 20:55:18 UTC (rev 9824)
@@ -12,13 +12,11 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -381,8 +381,7 @@
-             'build_mo': hgbuildmo,
+@@ -413,7 +413,6 @@ cmdclass = {'build': hgbuild,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
--            'build_hgextindex': buildhgextindex,
--            'install_scripts': hginstallscripts}
-+            'build_hgextindex': buildhgextindex}
+             'build_hgextindex': buildhgextindex,
+-            'install_scripts': hginstallscripts,
+             'build_hgexe': buildhgexe,
+             }
  
- packages = ['mercurial', 'mercurial.hgweb',
-             'mercurial.httpclient', 'mercurial.httpclient.tests',

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__hgk.py.patch	2013-07-02 20:55:18 UTC (rev 9824)
@@ -2,7 +2,7 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -307,7 +307,7 @@
+@@ -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/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately	2013-07-02 20:55:18 UTC (rev 9824)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -424,8 +424,7 @@
+@@ -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
-@@ -37,9 +37,11 @@
+@@ -130,9 +130,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-mo-fhs.patch	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-mo-fhs.patch	2013-07-02 20:55:18 UTC (rev 9824)
@@ -1,7 +1,7 @@
 Look for *.mo files in /usr/share/locale (FHS compliant)
 --- a/mercurial/i18n.py
 +++ b/mercurial/i18n.py
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ else:
      module = __file__
  
  base = os.path.dirname(module)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -424,7 +424,7 @@
+@@ -472,7 +472,7 @@ if sys.platform.startswith('linux') and
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately	2013-07-02 20:55:18 UTC (rev 9824)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -196,7 +196,7 @@
+@@ -323,7 +323,7 @@ funcs = {
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -430,14 +430,6 @@
+@@ -478,14 +478,6 @@ packagedata = {'mercurial': ['locale/*/L
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2013-07-02 20:55:18 UTC (rev 9824)
@@ -2,7 +2,7 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -352,7 +352,8 @@
+@@ -354,7 +354,8 @@ class bzmysql(bzaccess):
              import MySQLdb as mysql
              bzmysql._MySQLdb = mysql
          except ImportError, err:
@@ -14,7 +14,7 @@
  
 --- a/hgext/convert/bzr.py
 +++ b/hgext/convert/bzr.py
-@@ -44,7 +44,8 @@
+@@ -44,7 +44,8 @@ class bzr_source(converter_source):
              # access bzrlib stuff
              bzrdir
          except NameError:
@@ -26,7 +26,7 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -29,11 +29,12 @@
+@@ -28,11 +28,12 @@ def decodeargs(s):
  class MissingTool(Exception):
      pass
  
@@ -43,7 +43,7 @@
      pass
 --- a/hgext/convert/cvs.py
 +++ b/hgext/convert/cvs.py
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@ class convert_cvs(converter_source):
          if not os.path.exists(cvs):
              raise NoRepo(_("%s does not look like a CVS checkout") % path)
  
@@ -54,7 +54,7 @@
          self.files = {}
 --- a/hgext/convert/darcs.py
 +++ b/hgext/convert/darcs.py
-@@ -36,14 +36,15 @@
+@@ -36,14 +36,15 @@ class darcs_source(converter_source, com
          if not os.path.exists(os.path.join(path, '_darcs')):
              raise NoRepo(_("%s does not look like a darcs repository") % path)
  
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -52,7 +52,7 @@
+@@ -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)
  
@@ -82,10 +82,10 @@
 +        checktool('git', 'git', debname='git-core')
  
          self.path = path
- 
+         self.submodules = []
 --- a/hgext/convert/gnuarch.py
 +++ b/hgext/convert/gnuarch.py
-@@ -42,7 +42,8 @@
+@@ -42,7 +42,8 @@ class gnuarch_source(converter_source, c
              if util.findexe('tla'):
                  self.execmd = 'tla'
              else:
@@ -97,7 +97,7 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ class monotone_source(converter_source,
          self.files = None
          self.dirs  = None
  
@@ -108,20 +108,20 @@
          if self.automatestdio:
 --- a/hgext/convert/subversion.py
 +++ b/hgext/convert/subversion.py
-@@ -18,6 +18,7 @@
- 
+@@ -19,6 +19,7 @@ from cStringIO import StringIO
  from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
  from common import commandline, converter_source, converter_sink, mapfile
+ from common import makedatetimestamp
 +from common import checktool
  
  try:
      from svn.core import SubversionException, Pool
-@@ -227,16 +228,19 @@
+@@ -235,16 +236,19 @@ class svn_source(converter_source):
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
--            raise MissingTool(_('Could not load Subversion python bindings'))
-+            raise MissingTool(_('Could not load Subversion python bindings') +
+-            raise MissingTool(_('could not load Subversion python bindings'))
++            raise MissingTool(_('could not load Subversion python bindings') +
 +                              _(' (try installing the %s package)') % 'python-subversion')
  
          try:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1001,6 +1005,8 @@
+@@ -1013,6 +1017,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
@@ -150,7 +150,7 @@
          commandline.__init__(self, ui, 'svn')
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -194,7 +194,8 @@
+@@ -204,7 +204,8 @@ class _httprequesthandleropenssl(_httpre
              import OpenSSL
              OpenSSL.SSL.Context
          except ImportError:
@@ -160,7 +160,7 @@
          ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
          ctx.use_privatekey_file(ssl_cert)
          ctx.use_certificate_file(ssl_cert)
-@@ -235,7 +236,8 @@
+@@ -245,7 +246,8 @@ class _httprequesthandlerssl(_httpreques
              import ssl
              ssl.wrap_socket
          except ImportError:

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2013-07-02 20:55:18 UTC (rev 9824)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1970,8 +1970,8 @@ def debuginstall(ui):
+@@ -2048,8 +2048,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
-@@ -693,7 +693,7 @@ class ui(object):
+@@ -753,7 +753,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -67,8 +67,8 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -10140,8 +10140,8 @@ msgstr "(Vorlagen scheinen falsch instal
- msgid "Checking commit editor...\n"
+@@ -10755,8 +10755,8 @@ msgstr "(Vorlagen scheinen falsch instal
+ msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
@@ -78,7 +78,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -15292,7 +15292,8 @@ msgstr ""
+@@ -16055,7 +16055,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -88,7 +88,7 @@
  msgstr ""
  
  msgid ""
-@@ -16050,7 +16051,7 @@ msgid ""
+@@ -16837,7 +16838,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"
@@ -97,12 +97,12 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -16059,7 +16060,7 @@ msgstr ""
- "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
- "ermittelt.\n"
- "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind, wird\n"
--"    der Standard 'vi' verwendet."
-+"    der Standard 'sensible-editor' verwendet."
+@@ -16845,7 +16846,7 @@ msgstr ""
+ "    geschrieben wird. Der verwendete Editor wird aus den drei Umgebungs-\n"
+ "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) ermittelt.\n"
+ "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
+-"    wird die Voreinstellung 'vi' verwendet."
++"    wird die Voreinstellung 'sensible-editor' verwendet."
  
  msgid ""
  "PYTHONPATH\n"
@@ -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,9 +170,9 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -10595,8 +10595,8 @@ msgstr " (テンプレートのインス
- msgid "Checking commit editor...\n"
- msgstr "メッセージ入力用エディタの検証中...\n"
+@@ -11539,8 +11539,8 @@ msgstr " (テンプレートのインス
+ msgid "checking commit editor...\n"
+ msgstr "メッセージ入力用エディタの確認中...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " エディタが起動できません(vi にも PATH が通っていません)\n"
@@ -180,8 +180,8 @@
 +msgstr " エディタが起動できません(sensible-editor にも PATH が通っていません)\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -16815,11 +16815,12 @@ msgstr ""
+ msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
+@@ -18069,11 +18069,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -17841,7 +17842,7 @@ msgid ""
+@@ -19220,7 +19221,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"
@@ -204,8 +204,8 @@
 +"    defaults to 'sensible-editor'."
  msgstr ""
  "EDITOR\n"
- "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -17849,7 +17850,7 @@ msgstr ""
+ "    コミットログ入力時のように、 エディタでファイルを開き、\n"
+@@ -19228,7 +19229,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,9 +216,9 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -10745,10 +10745,10 @@ msgstr " (modelos parecem ter sido insta
- msgid "Checking commit editor...\n"
- msgstr "Verificando editor para consolidação...\n"
+@@ -11688,10 +11688,10 @@ msgstr " (modelos parecem ter sido insta
+ msgid "checking commit editor...\n"
+ msgstr "verificando editor para consolidação...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -17119,10 +17119,12 @@ msgstr ""
+@@ -18386,10 +18386,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18174,7 +18176,7 @@ msgid ""
+@@ -19579,7 +19581,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"
-@@ -18182,7 +18184,7 @@ msgstr ""
+@@ -19587,7 +19589,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"
@@ -264,9 +264,9 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -8717,8 +8717,8 @@ msgstr " (mallar verkar vara inkorrekt i
- msgid "Checking commit editor...\n"
- msgstr "Kontrollerar arkiveringseditor...\n"
+@@ -9509,8 +9509,8 @@ msgstr " (mallar verkar vara inkorrekt i
+ msgid "checking commit editor...\n"
+ msgstr "kontrollerar arkiveringseditor...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n"
@@ -275,7 +275,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
-@@ -13794,7 +13794,8 @@ msgstr ""
+@@ -14852,7 +14852,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -285,7 +285,7 @@
  msgstr ""
  
  msgid ""
-@@ -14477,7 +14478,7 @@ msgid ""
+@@ -15564,7 +15565,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"
@@ -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.
+@@ -1154,7 +1154,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``
@@ -391,9 +391,9 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -10969,8 +10969,8 @@ msgstr " (шаблоны, похоже,
- msgid "Checking commit editor...\n"
- msgstr "Проверка редактора сообщений фиксации...\n"
+@@ -11937,8 +11937,8 @@ msgstr " (шаблоны, похоже,
+ msgid "checking commit editor...\n"
+ msgstr "проверка редактора сообщений фиксации...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Редактор сообщений не установлен и vi не доступен в PATH\n"
@@ -402,7 +402,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (задайте редактор сообщений в вашем конфиге)\n"
-@@ -17256,10 +17256,12 @@ msgstr ""
+@@ -18557,10 +18557,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -18290,14 +18292,14 @@ msgid ""
+@@ -19733,14 +19735,14 @@ 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"

Modified: packages/mercurial/branches/wheezy-backports/debian/rules
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/rules	2013-07-02 20:45:37 UTC (rev 9823)
+++ packages/mercurial/branches/wheezy-backports/debian/rules	2013-07-02 20:55:18 UTC (rev 9824)
@@ -23,6 +23,7 @@
 ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 # test-pull-pull-corruption tries to execute two hg commands at the
 # same time to test for corruption.  It does so by running an hg
 # command in the background, sleeping one second and running the
@@ -37,6 +38,7 @@
 	dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
 	rename.ul .deb-backup '' $(CURDIR)/tests/*
+endif
 
 build-python%: mercurial/__version__.py
 	python$* setup.py build