[Python-apps-commits] r7935 - in packages/mercurial/branches/squeeze-backports/debian (16 files)

vicho-guest at users.alioth.debian.org vicho-guest at users.alioth.debian.org
Sun Dec 11 23:39:07 UTC 2011 

    Date: Sunday, December 11, 2011 @ 23:39:05
  Author: vicho-guest
Revision: 7935

Merge from 7087:7933 from trunk into squeeze-backports

Added:
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch
    (from rev 7933, packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch)
Modified:
  packages/mercurial/branches/squeeze-backports/debian/changelog
  packages/mercurial/branches/squeeze-backports/debian/control
  packages/mercurial/branches/squeeze-backports/debian/copyright
  packages/mercurial/branches/squeeze-backports/debian/mercurial.postinst
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/squeeze-backports/debian/patches/series
  packages/mercurial/branches/squeeze-backports/debian/rules
  packages/mercurial/branches/squeeze-backports/debian/watch
Deleted:
  packages/mercurial/branches/squeeze-backports/debian/pycompat
  packages/mercurial/branches/squeeze-backports/debian/pyversions

Modified: packages/mercurial/branches/squeeze-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/changelog	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/changelog	2011-12-11 23:39:05 UTC (rev 7935)
@@ -1,3 +1,74 @@
+mercurial (2.0.1-1) unstable; urgency=low
+
+  * New upstream revision (Closes: #650727).
+  * Fix "new -rc release are not properly parsed by watch" with a patch
+    from Pierre-Yves David <pierre-yves.david at logilab.fr> (Closes:
+    #650728)
+
+ -- Javi Merino <cibervicho at gmail.com>  Fri, 02 Dec 2011 21:35:31 +0000
+
+mercurial (2.0-2) unstable; urgency=low
+
+  * Fix "Cloning fails with: mpatch.mpatchError: patch cannot be decoded"
+    by not compiling bdiff.c with optimizations in armel.  This is
+    probably a bug in gcc-4.6 (gcc 4.5 works fine) but while it's solved,
+    at least mercurial works again in armel (Closes: #636396)
+
+ -- Javi Merino <cibervicho at gmail.com>  Thu, 03 Nov 2011 23:00:43 +0000
+
+mercurial (2.0-1) unstable; urgency=low
+
+  * New upstream release 2.0
+  * Don't include empty directories in the package
+
+ -- Javi Merino <cibervicho at gmail.com>  Tue, 01 Nov 2011 22:40:40 +0000
+
+mercurial (1.9.999+2.0rc1-1) experimental; urgency=low
+
+  * Upstream 2.0 Release Candidate 1
+  * Cover more uses of "defaults to sensible-editor" in the
+    documentation and support ru and ro translations.
+
+ -- Javi Merino <cibervicho at gmail.com>  Sun, 30 Oct 2011 13:20:38 +0000
+
+mercurial (1.9.3-1) unstable; urgency=low
+
+  * New upstream release 1.9.3.
+
+ -- Javi Merino <cibervicho at gmail.com>  Tue, 11 Oct 2011 22:31:33 +0100
+
+mercurial (1.9.2-1) unstable; urgency=low
+
+  * New upstream release 1.9.2.
+  * Remove old code that removed cruft from site-packages
+
+ -- Javi Merino <cibervicho at gmail.com>  Mon, 12 Sep 2011 20:55:12 +0100
+
+mercurial (1.9.1-2) unstable; urgency=low
+
+  * Update breaks to include all the packages that mercurial-1.9.1-1 broke
+    because of the uncoordinated transition to dh_python2.
+
+ -- Javi Merino <cibervicho at gmail.com>  Wed, 10 Aug 2011 21:37:37 +0100
+
+mercurial (1.9.1-1) unstable; urgency=low
+
+  * Convert to dh_python2
+  * New upstream release 1.9.1 fixes "cannot import mercurial.httpclient
+    with Python 2.7: 'module' object has no attribute 'PROTOCOL_SSLv2'"
+    (Closes: #635496)
+
+ -- Javi Merino <cibervicho at gmail.com>  Wed, 03 Aug 2011 08:00:03 +0100
+
+mercurial (1.9-1) unstable; urgency=low
+
+  * New upstream release 1.9 (Closes: #632250)
+  * Strip trailing .0 from Debian Policy
+  * Remove template warnings from debian/watch to remove a lintian
+    warning
+
+ -- Javi Merino <cibervicho at gmail.com>  Fri, 22 Jul 2011 19:44:26 +0200
+
 mercurial (1.8.3-1~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.

Modified: packages/mercurial/branches/squeeze-backports/debian/control
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/control	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/control	2011-12-11 23:39:05 UTC (rev 7935)
@@ -8,12 +8,13 @@
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.0.0),
  patchutils (>= 0.2.25), gettext,
- python-support (>= 0.5.3), python-all-dev (>= 2.5.4-1~), python-docutils,
+ python-all-dev (>= 2.6.6-3~), python-docutils,
  zip, unzip
-Standards-Version: 3.9.2.0
+Standards-Version: 3.9.2
 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/
+X-Python-Version: >= 2.4
 
 Package: mercurial-common
 Architecture: all 
@@ -25,7 +26,7 @@
  python-openssl
 Breaks: mercurial (<< ${source:Version})
 Replaces: mercurial (<< 1.4)
-Description: scalable distributed version control system (common files)
+Description: easy-to-use, scalable distributed version control system (common files)
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.
  . 
@@ -40,8 +41,8 @@
  wish, 
  vim | emacs,
  kdiff3 | tkdiff | meld | xxdiff
-Breaks: mercurial-git (<< 0.2.6)
-Description: scalable distributed version control system
+Breaks: hgsubversion (<= 1.2.1-2), hgview (<= 1.2.1-1), mercurial-git (<< 0.2.6-2), qct (<= 1.7-1)
+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/squeeze-backports/debian/copyright
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/copyright	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/copyright	2011-12-11 23:39:05 UTC (rev 7935)
@@ -1,5 +1,4 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=143
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: mercurial
 Upstream-Source: http://www.selenic.com/mercurial/
 
@@ -21,6 +20,14 @@
 Files: debian/*
 Copyright: Copyright 2005-2010, Vincent Danjean <vdanjean at debian.org>
 License: GPL-2+
-
-This package was debianized by Vincent Danjean <Vincent.Danjean at ens-lyon.org> on
-Fri, 29 Apr 2005 08:54:25 +0200.
+ You can redistribute this software and/or modify it under the terms of
+ the GNU General Public License as published by the Free Software
+ Foundation; version 2 or any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.

Modified: packages/mercurial/branches/squeeze-backports/debian/mercurial.postinst
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/mercurial.postinst	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/mercurial.postinst	2011-12-11 23:39:05 UTC (rev 7935)
@@ -19,14 +19,6 @@
 
 case "$1" in
     configure)
-        # Fix for old packages not managing pyc files
-        for d in /usr/lib/python*/site-packages/mercurial /usr/lib/python*/site-packages/hgext ; do
-	    if [ -d "$d" ] ; then
-	        echo "Removing old python byte-compiled files in $d"
-	        rm -rf "$d"
-	    fi
-	done
-
 	for conffile in hgext.rc; do
 	  # Tell ucf that the file in /usr/share/mercurial is the latest maintainer
 	  # version, and let it handle how to manage the real configuration file in

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2011-12-11 23:39:05 UTC (rev 7935)
@@ -12,12 +12,13 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -315,7 +315,7 @@
+@@ -338,8 +338,7 @@
  cmdclass = {'build_mo': hgbuildmo,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
+-            'build_hgextindex': buildhgextindex,
 -            'install_scripts': hginstallscripts}
-+           }
++            'build_hgextindex': buildhgextindex}
  
- packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert',
-             'hgext.highlight', 'hgext.zeroconf']
+ packages = ['mercurial', 'mercurial.hgweb',
+             'mercurial.httpclient', 'mercurial.httpclient.tests',

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately	2011-12-11 23:39:05 UTC (rev 7935)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -349,8 +349,7 @@
+@@ -381,8 +381,7 @@
          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
-@@ -73,9 +73,11 @@
+@@ -37,9 +37,11 @@
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch	2011-12-11 23:39:05 UTC (rev 7935)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -349,7 +349,7 @@
+@@ -381,7 +381,7 @@
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately	2011-12-11 23:39:05 UTC (rev 7935)
@@ -2,7 +2,7 @@
 
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py
-@@ -194,7 +194,7 @@
+@@ -196,7 +196,7 @@
  
  # template engine
  
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -355,14 +355,6 @@
+@@ -387,14 +387,6 @@
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch (from rev 7933, packages/mercurial/trunk/debian/patches/deb_specific__no_optim_bdiff_armel.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch	2011-12-11 23:39:05 UTC (rev 7935)
@@ -0,0 +1,30 @@
+From: Javi Merino <cibervicho at gmail.com>
+Description: gcc-4.6 -O2 miscompiles bdiff in armel
+ This patch disables optimizations for bdiff in -O0 so that mercurial
+ works in armel while we fix it in gcc.
+ .
+ Mercurial says it's not their problem so they won't accept the patch.
+ In any case, this has to be a temporal hack.
+Bug-Debian: http://bugs.debian.org/636396
+Bug-Mercurial: http://mercurial.selenic.com/bts/issue2877
+
+--- a/setup.py
++++ b/setup.py
+@@ -349,12 +349,16 @@
+ 
+ extmodules = [
+     Extension('mercurial.base85', ['mercurial/base85.c']),
+-    Extension('mercurial.bdiff', ['mercurial/bdiff.c']),
+     Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']),
+     Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
+     Extension('mercurial.parsers', ['mercurial/parsers.c']),
+     ]
+ 
++if platform.machine() == 'armv5tel':
++    extmodules.append(Extension('mercurial.bdiff', ['mercurial/bdiff.c'], extra_compile_args=['-O0']))
++else:
++    extmodules.append(Extension('mercurial.bdiff', ['mercurial/bdiff.c']))
++
+ osutil_ldflags = []
+ 
+ if sys.platform == 'darwin':

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies	2011-12-11 23:39:05 UTC (rev 7935)
@@ -2,16 +2,16 @@
 
 --- a/hgext/bugzilla.py
 +++ b/hgext/bugzilla.py
-@@ -423,7 +423,8 @@
-         global MySQLdb
-         MySQLdb = mysql
-     except ImportError, err:
--        raise util.Abort(_('python mysql support not available: %s') % err)
-+        raise util.Abort(_('python mysql support not available: %s') % err +
-+                         _(' (try installing the %s package)') % 'python-mysqldb')
+@@ -316,7 +316,8 @@
+             import MySQLdb as mysql
+             bzmysql._MySQLdb = mysql
+         except ImportError, err:
+-            raise util.Abort(_('python mysql support not available: %s') % err)
++            raise util.Abort(_('python mysql support not available: %s') % err +
++                             _(' (try installing the %s package)') % 'python-mysqldb')
  
-     if node is None:
-         raise util.Abort(_('hook type %s does not pass a changeset id') %
+         bzaccess.__init__(self, ui)
+ 
 --- a/hgext/convert/bzr.py
 +++ b/hgext/convert/bzr.py
 @@ -44,7 +44,8 @@
@@ -33,7 +33,7 @@
 -def checktool(exe, name=None, abort=True):
 +def checktool(exe, name=None, abort=True, debname=None):
      name = name or exe
-     if not util.find_exe(exe):
+     if not util.findexe(exe):
          exc = abort and util.Abort or MissingTool
 -        raise exc(_('cannot find required "%s" tool') % name)
 +        raise exc(_('cannot find required "%s" tool') % name +
@@ -74,7 +74,7 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -44,7 +44,7 @@
+@@ -52,7 +52,7 @@
          if not os.path.exists(path + "/objects"):
              raise NoRepo(_("%s does not look like a Git repository") % path)
  
@@ -86,7 +86,7 @@
 --- a/hgext/convert/gnuarch.py
 +++ b/hgext/convert/gnuarch.py
 @@ -42,7 +42,8 @@
-             if util.find_exe('tla'):
+             if util.findexe('tla'):
                  self.execmd = 'tla'
              else:
 -                raise util.Abort(_('cannot find a GNU Arch tool'))
@@ -97,15 +97,15 @@
  
 --- a/hgext/convert/monotone.py
 +++ b/hgext/convert/monotone.py
-@@ -62,7 +62,7 @@
+@@ -66,7 +66,7 @@
          self.files = None
          self.dirs  = None
  
 -        checktool('mtn', abort=False)
 +        checktool('mtn', abort=False, debname='monotone')
  
-         # test if there are any revisions
-         self.rev = None
+     def mtnrun(self, *args, **kwargs):
+         if self.automatestdio:
 --- a/hgext/convert/subversion.py
 +++ b/hgext/convert/subversion.py
 @@ -21,6 +21,7 @@
@@ -116,7 +116,7 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -210,16 +211,19 @@
+@@ -230,16 +231,19 @@
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
@@ -139,18 +139,18 @@
  
          self.lastrevs = {}
  
-@@ -963,6 +967,8 @@
+@@ -977,6 +981,8 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
 +        checktool('svn', debname='subversion')
 +        checktool('svnadmin', debname='subversion')
  
-         if svn is None:
-             raise MissingTool(_('Could not load Subversion python bindings'))
+         converter_sink.__init__(self, ui, path)
+         commandline.__init__(self, ui, 'svn')
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -184,7 +184,8 @@
+@@ -194,7 +194,8 @@
              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)
-@@ -225,7 +226,8 @@
+@@ -235,7 +236,8 @@
              import ssl
              ssl.wrap_socket
          except ImportError:

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch	2011-12-11 23:39:05 UTC (rev 7935)
@@ -1,17 +1,5 @@
 Use sensible-editor as default instead of vi.
 
---- a/doc/hgrc.5.txt
-+++ b/doc/hgrc.5.txt
-@@ -891,7 +891,8 @@
- ``debug``
-     Print debugging information. True or False. Default is False.
- ``editor``
--    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
-+    The editor to use during a commit. Default is ``$EDITOR`` or
-+    ``sensible-editor``.
- ``fallbackencoding``
-     Encoding to try if it's not possible to decode the changelog using
-     UTF-8. Default is ISO-8859-1.
 --- a/hgeditor
 +++ b/hgeditor
 @@ -7,7 +7,7 @@
@@ -25,9 +13,9 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1501,8 +1501,8 @@
+@@ -1879,8 +1879,8 @@
      editor = ui.geteditor()
-     cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
+     cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
 -        if editor == 'vi':
 -            ui.write(_(" No commit editor set and can't find vi in PATH\n"))
@@ -38,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -580,7 +580,7 @@
+@@ -678,7 +678,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -49,7 +37,7 @@
          '''show a progress message
 --- a/i18n/da.po
 +++ b/i18n/da.po
-@@ -7437,7 +7437,7 @@
+@@ -8752,7 +8752,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -58,7 +46,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -10749,7 +10749,7 @@
+@@ -14194,7 +14194,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"
@@ -69,7 +57,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -8573,8 +8573,8 @@
+@@ -8576,8 +8576,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -80,7 +68,7 @@
  
  #, fuzzy
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13430,7 +13430,7 @@
+@@ -13433,7 +13433,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"
@@ -89,7 +77,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -13438,7 +13438,7 @@
+@@ -13441,7 +13441,7 @@
  "    Nachricht geschrieben wird. Der verwendete Editor wird aus den drei\n"
  "    Umgebungsvariablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge)\n"
  "    ermittelt. Der erste nicht-leere wird verwendet. Wenn alle Angaben\n"
@@ -140,7 +128,7 @@
  msgid " (specify a commit editor in your .hgrc file)\n"
 --- a/i18n/it.po
 +++ b/i18n/it.po
-@@ -7154,8 +7154,8 @@
+@@ -7157,8 +7157,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Sto controllando l'editor per il commit...\n"
  
@@ -151,7 +139,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -10459,7 +10459,7 @@
+@@ -10462,7 +10462,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"
@@ -162,7 +150,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -7698,8 +7698,8 @@
+@@ -9076,8 +9076,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -173,7 +161,17 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -11339,7 +11339,7 @@
+@@ -14893,7 +14893,8 @@
+ 
+ msgid ""
+ "``editor``\n"
+-"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
++"    ``sensible-editor``."
+ msgstr ""
+ "``editor``\n"
+ "    コミットログ入力用エディタ。 無指定の場合、 ``$EDITOR`` ないし\n"
+@@ -15882,7 +15883,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"
@@ -182,7 +180,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -11347,7 +11347,7 @@
+@@ -15890,7 +15891,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -193,18 +191,35 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -8490,8 +8490,8 @@
+@@ -10216,10 +10216,10 @@
  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"
--msgstr " Nenhum editor para consolidação configurado, e não foi possível encontrar 'vi' no PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
-+msgstr " Nenhum editor para consolidação configurado, e não foi possível encontrar 'sensible-editor' no PATH\n"
+ msgstr ""
+ " Nenhum editor para consolidação configurado, e não foi possível encontrar "
+-"'vi' no PATH\n"
++"'sensible-editor' no PATH\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n"
-@@ -12177,7 +12177,7 @@
+ msgstr ""
+@@ -16234,10 +16234,12 @@
+ 
+ msgid ""
+ "``editor``\n"
+-"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
++"    ``sensible-editor``."
+ msgstr ""
+ "``editor``\n"
+-"    O editor usado durante um commit. O padrão é ``$EDITOR`` ou ``vi``."
++"    O editor usado durante um commit. O padrão é ``$EDITOR`` ou\n"
++"    ``sensible-editor``."
+ 
+ msgid ""
+ "``fallbackencoding``\n"
+@@ -17257,7 +17259,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"
@@ -213,7 +228,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -12185,7 +12185,7 @@
+@@ -17265,7 +17267,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"
@@ -224,7 +239,7 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -7188,7 +7188,7 @@
+@@ -7890,7 +7890,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -233,7 +248,17 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -10683,7 +10683,7 @@
+@@ -12460,7 +12460,8 @@
+ 
+ msgid ""
+ "``editor``\n"
+-"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
++"    ``sensible-editor``."
+ msgstr ""
+ 
+ msgid ""
+@@ -13126,7 +13127,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"
@@ -286,7 +311,7 @@
  msgid ""
 --- a/mercurial/help/environment.txt
 +++ b/mercurial/help/environment.txt
-@@ -86,7 +86,7 @@
+@@ -94,7 +94,7 @@
      editor it uses is determined by looking at the environment
      variables HGEDITOR, VISUAL and EDITOR, in that order. The first
      non-empty one is chosen. If all of them are empty, the editor
@@ -295,3 +320,88 @@
  
  PYTHONPATH
      This is used by Python to find imported modules and may need to be
+--- a/mercurial/help/config.txt
++++ b/mercurial/help/config.txt
+@@ -1016,7 +1016,8 @@
+     Print debugging information. True or False. Default is False.
+ 
+ ``editor``
+-    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
++    The editor to use during a commit. Default is ``$EDITOR`` or
++    ``sensible-editor``.
+ 
+ ``fallbackencoding``
+     Encoding to try if it's not possible to decode the changelog using
+--- a/i18n/ro.po
++++ b/i18n/ro.po
+@@ -7722,7 +7722,7 @@
+ msgid "Checking commit editor...\n"
+ msgstr "Se verifică editorul pentru commit...\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"
+ msgstr ""
+ 
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -11925,7 +11925,8 @@
+ 
+ msgid ""
+ "``editor``\n"
+-"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
++"    ``sensible-editor``."
+ msgstr ""
+ 
+ msgid ""
+@@ -12570,7 +12571,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"
+-"    defaults to 'vi'."
++"    defaults to 'sensible-editor'."
+ msgstr ""
+ 
+ msgid ""
+--- a/i18n/ru.po
++++ b/i18n/ru.po
+@@ -7893,7 +7893,7 @@
+ msgid "Checking commit editor...\n"
+ msgstr ""
+ 
+-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"
+ msgstr ""
+ 
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -13231,10 +13231,12 @@
+ 
+ msgid ""
+ "``editor``\n"
+-"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
++"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
++"    ``sensible-editor``."
+ msgstr ""
+ "``editor``\n"
+-"    Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or ``vi``."
++"    Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or\n"
++"    ``sensible-editor``."
+ 
+ msgid ""
+ "``fallbackencoding``\n"
+@@ -14204,14 +14206,14 @@
+ "    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"
+-"    defaults to 'vi'."
++"    defaults to 'sensible-editor'."
+ msgstr ""
+ "EDITOR\n"
+ "    Инодга требуется открыть текстовый файл в редакторе, чтобы.\n"
+ "    внести изменения, например для написания сообщения коммита.\n"
+ "    Используемый редактор определяется переменными среды HGEDITOR,\n"
+ "    VISUAL и EDITOR, именно в таком порядке. Выбирается первая\n"
+-"    непустая переменная. Если они все пусты, используется 'vi'."
++"    непустая переменная. Если они все пусты, используется 'sensible-editor'."
+ 
+ msgid ""
+ "PYTHONPATH\n"

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/series	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/series	2011-12-11 23:39:05 UTC (rev 7935)
@@ -6,3 +6,4 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
+deb_specific__no_optim_bdiff_armel.patch

Deleted: packages/mercurial/branches/squeeze-backports/debian/pycompat
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/pycompat	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/pycompat	2011-12-11 23:39:05 UTC (rev 7935)
@@ -1 +0,0 @@
-2

Deleted: packages/mercurial/branches/squeeze-backports/debian/pyversions
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/pyversions	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/pyversions	2011-12-11 23:39:05 UTC (rev 7935)
@@ -1 +0,0 @@
-2.4-

Modified: packages/mercurial/branches/squeeze-backports/debian/rules
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/rules	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/rules	2011-12-11 23:39:05 UTC (rev 7935)
@@ -2,19 +2,18 @@
 # -*- mode: makefile; coding: utf-8 -*-
 
 %:
-	dh $@
+	dh $@ --with python2
 
 PYVERS=$(shell pyversions -vs)
 
 override_dh_auto_build: $(PYVERS:%=build-python%)
 	$(MAKE) -C doc man
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# Tests are not yet ready to be run in Debian build context
-	#$(MAKE) tests
-endif
 	# Do not start a line with a word with a dot in a manpage
 	sed -i -e 's,^[.]\(hgignore\|hg/hgrc\),\\fP\1,' doc/hg.1
 
+# Tests are not yet ready to be run in Debian build context
+override_dh_auto_test:
+
 build-python%: mercurial/__version__.py
 	python$* setup.py build
 	touch $@
@@ -63,9 +62,13 @@
 		-name '*.so' ! -type d -delete , \
 		-type d -empty -delete
 
+override_dh_python2:
+	dh_python2
+	find debian/mercurial/usr/share -type d -empty -delete
+
 override_dh_auto_clean: mercurial/__version__.py
 	cp -a mercurial/__version__.py mercurial/__version__.py.save
-	$(MAKE) clean
+	dh_auto_clean
 	mv mercurial/__version__.py.save mercurial/__version__.py
 	$(RM) -rv tmp/
 	$(RM) build-python*

Modified: packages/mercurial/branches/squeeze-backports/debian/watch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/watch	2011-12-11 22:55:17 UTC (rev 7934)
+++ packages/mercurial/branches/squeeze-backports/debian/watch	2011-12-11 23:39:05 UTC (rev 7935)
@@ -1,8 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 2 file
 version=2
 
@@ -11,7 +6,5 @@
 #http://www.example.com/downloads.php mercurial-(.*)\.tar\.gz
 
 # Uncomment to examine a Webserver directory
-#http://www.example.com/pub/mercurial-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-http://www.selenic.com/mercurial/release/mercurial-([^s].*)\.tar\.gz
+opts="uversionmangle=s/-rc/~rc/" \
+  http://www.selenic.com/mercurial/release/mercurial-([^s].*)\.tar\.gz

More information about the Python-apps-commits mailing list