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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Sun Apr 15 16:59:39 UTC 2012 

    Date: Sunday, April 15, 2012 @ 16:59:38
  Author: vicho
Revision: 8483

Merge revs 7933:8424 from trunk into squeeze-backports branch

Added:
  packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist
    (from rev 8424, packages/mercurial/trunk/debian/mercurial.test_blacklist)
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch
    (from rev 8424, packages/mercurial/trunk/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch)
  packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
    (from rev 8424, packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch)
  packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
    (from rev 8424, packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch)
Modified:
  packages/mercurial/branches/squeeze-backports/debian/changelog
  packages/mercurial/branches/squeeze-backports/debian/control
  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/mercurial.lintian-overrides
  packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch

Modified: packages/mercurial/branches/squeeze-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/changelog	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/changelog	2012-04-15 16:59:38 UTC (rev 8483)
@@ -1,3 +1,99 @@
+mercurial (2.1.2-2) unstable; urgency=low
+
+  * Add sparc to the list of architectures with slow buildds
+  * Import 91eec29dd7de from upstream to fix the test-suite failures in
+    mips and sparc
+
+ -- Javi Merino <vicho at debian.org>  Tue, 03 Apr 2012 21:54:05 +0100
+
+mercurial (2.1.2-1) unstable; urgency=low
+
+  * New upstream release 2.1.2
+  * Add armel to the list of architectures with slow buildds
+  * Drop patch "deb_specific__no_optim_bdiff_armel.patch" as gcc no
+    longer miscompiles bdiff in armel
+  * Remove confusing entry in Debian.NEWS (Closes: #666549)
+  * Remove patches for_upstream__fix_kfreebsd_test_inherit.patch,
+    from_upstream__dont_translate_the_abort_message_twice.patch and
+    from_upstream__fix_all_remaining_uses_of_inside.patch which are now
+    included upstream
+  * Add patch for_upstream__skip_test_gpg_if_not_mercurial_wd.patch to
+    skip test-gpg when the testsuite is not run in a hg checkout
+
+ -- Javi Merino <vicho at debian.org>  Mon, 02 Apr 2012 22:50:29 +0100
+
+mercurial (2.1.1-2) unstable; urgency=low
+
+  * Add kfreebsd-i386 to the list of slow architectures for the test suite.
+  * Improve the fix for the test-inherit-mode.t patch based on
+    suggestions from upstream
+  * Fix "UnicodeDecodeError when refusing to update" by adding patches
+    from_upstream__dont_translate_the_abort_message_twice.patch and
+    from_upstream__fix_all_remaining_uses_of_inside.patch  (Closes: #662207)
+
+ -- Javi Merino <vicho at debian.org>  Fri, 09 Mar 2012 00:14:13 +0000
+
+mercurial (2.1.1-1) unstable; urgency=low
+
+  * New upstream version 2.1.1-1
+  * Change the group of the test dir in test-inherit-mode.t so that the
+    testsuite doesn't fail in kfreebsd-*
+  * Drop from_upstream__test_check_code_hg_skip_test_if_not_wd.patch
+    which is now included upstream
+  * Upload to unstable
+
+ -- Javi Merino <vicho at debian.org>  Sat, 03 Mar 2012 08:03:18 +0000
+
+mercurial (2.1-3) experimental; urgency=low
+
+  * Remove unused lintian override binary-without-manpage
+  * Bump standards-version to 3.9.3 (no change needed)
+  * Suggest tkcvs instead of tkdiff.  tkdiff has been removed from
+    wheezy as tkcvs provides tkdiff (see bug #483362).
+  * Suggest more visual diff commands
+  * Increment test timeout.  test-bisect2.t timed out on mips.
+  * Increment the sleeps in the testsuite in mips so that the test
+    produces the same output than in faster architectures
+  * Ignore the output of chmod in a test so that the testsuite doesn't
+    fail in kfreebsd-*
+  * Add patch
+    from_upstream__test_check_code_hg_skip_test_if_not_wd.patch to skip
+    test_check_code_hg instead of having to blacklist it
+
+ -- Javi Merino <vicho at debian.org>  Wed, 29 Feb 2012 08:51:26 +0000
+
+mercurial (2.1-2) experimental; urgency=low
+
+  * Recommend ssh
+  * Bump watch version to 3 since we are using version mangling
+  * Run tests in the buildds
+  * Added my new DD account
+
+ -- Javi Merino <vicho at debian.org>  Sat, 25 Feb 2012 18:12:14 +0000
+
+mercurial (2.1-1) unstable; urgency=low
+
+  * New upstream revision
+
+ -- Javi Merino <cibervicho at gmail.com>  Fri, 03 Feb 2012 18:38:19 +0100
+
+mercurial (2.0.2-1) unstable; urgency=low
+
+  * New upstream revision
+  * Fix "hg-ssh is installed system-wide but uses "/usr/bin/env python"
+    as the python interpreter" with a patch that fixes the interpreter
+    (Closes: #654925)
+
+ -- Javi Merino <cibervicho at gmail.com>  Fri, 06 Jan 2012 22:09:32 +0000
+
+mercurial (2.0.1-2) unstable; urgency=low
+
+  * Team Upload  
+  * Update Breaks for hgsubversion (see bug #646946), hg-git (see bug
+    #645037), hgview (see bug #637400), and qct (see bug #637401).
+
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 11 Dec 2011 23:47:26 +0100
+
 mercurial (2.0.1-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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/control	2012-04-15 16:59:38 UTC (rev 8483)
@@ -3,14 +3,12 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean at debian.org>,
- Vernon Tang <vt at foilhead.net>,
- Javi Merino <cibervicho at gmail.com>
-DM-Upload-Allowed: yes
+ Javi Merino <vicho at debian.org>
 Build-Depends: debhelper (>= 8.0.0),
  patchutils (>= 0.2.25), gettext,
  python-all-dev (>= 2.6.6-3~), python-docutils,
  zip, unzip
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 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/
@@ -37,11 +35,12 @@
 Architecture: any 
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020),
  mercurial-common (= ${source:Version})
+Recommends: openssh-client
 Suggests: qct, 
  wish, 
  vim | emacs,
- kdiff3 | tkdiff | meld | xxdiff
-Breaks: hgsubversion (<= 1.3), hgview (<= 1.3.0-2~), mercurial-git (<< 0.3.1), qct (<= 1.7-2~)
+ 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~)
 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.

Deleted: packages/mercurial/branches/squeeze-backports/debian/mercurial.lintian-overrides
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/mercurial.lintian-overrides	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/mercurial.lintian-overrides	2012-04-15 16:59:38 UTC (rev 8483)
@@ -1,2 +0,0 @@
-# The hg(1) man page is installed by mercurial-common.
-binary-without-manpage usr/bin/hg

Copied: packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist (from rev 8424, packages/mercurial/trunk/debian/mercurial.test_blacklist)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/mercurial.test_blacklist	2012-04-15 16:59:38 UTC (rev 8483)
@@ -0,0 +1,47 @@
+# These tests need networking (there is no network in buildds, not
+# even loopback)
+test-archive.t
+test-extension.t
+test-hgweb.t
+test-hgweb-commands.t
+test-hgweb-descend-empties.t
+test-hgweb-diffs.t
+test-hgweb-empty.t
+test-hgweb-filelog.t
+test-hgweb-no-path-info.t
+test-hgweb-no-request-uri.t
+test-hgweb-non-interactive.t
+test-hgweb-raw.t
+test-hgweb-removed.t
+test-hgwebdir.t
+test-hgwebdirsym.t
+test-interhg.t
+test-keyword.t
+test-mq-qclone-http.t
+test-mq-qimport.t
+test-newcgi.t
+test-newercgi.t
+test-oldcgi.t
+test-serve.t
+test-share.t
+test-subrepo-relative-path.t
+
+# Failed to locate styles (?)
+test-bisect3.t
+test-command-template.t
+test-glog.t
+test-install.t
+test-log.t
+test-tag.t
+
+# No such file or directory /usr/share/mercurial/help/revsets.txt (?)
+test-bookmarks.t
+test-help.t
+test-mq.t
+test-transplant.t
+
+# No *.po in $TESTDIR/i18n/ (?)
+test-gendoc.t
+
+# I'm missing some locales or something (?)
+test-i18n.t

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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -12,8 +12,8 @@
  
 --- a/setup.py
 +++ b/setup.py
-@@ -338,8 +338,7 @@
- cmdclass = {'build_mo': hgbuildmo,
+@@ -375,8 +375,7 @@
+             'build_mo': hgbuildmo,
              'build_ext': hgbuildext,
              'build_py': hgbuildpy,
 -            'build_hgextindex': buildhgextindex,

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch (from rev 8424, packages/mercurial/trunk/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__fix_hg-ssh_interpreter.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -0,0 +1,17 @@
+Author: Javi Merino <cibervicho at gmail.com>
+Description: Fix python interpreter for hg-ssh
+ hg-ssh is installed by dh_install instead of setup.py, so it's
+ interpreter is not fixed automatically for us.  System-wide commands
+ should use /usr/bin/python as the Debian Python Policy recommends.
+Bug-Debian: http://bugs.debian.org/654925
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/912625
+Forwarded: not-needed
+
+--- a/contrib/hg-ssh
++++ b/contrib/hg-ssh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # Copyright 2005-2007 by Intevation GmbH <intevation at intevation.de>
+ #

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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-help-separately	2012-04-15 16:59:38 UTC (rev 8483)
@@ -2,7 +2,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -381,8 +381,7 @@
+@@ -418,8 +418,7 @@
          extmodules.append(inotify)
          packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
  

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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-mo-fhs.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -12,7 +12,7 @@
          break
 --- a/setup.py
 +++ b/setup.py
-@@ -381,7 +381,7 @@
+@@ -418,7 +418,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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__install-templates-separately	2012-04-15 16:59:38 UTC (rev 8483)
@@ -13,7 +13,7 @@
  def _flatten(thing):
 --- a/setup.py
 +++ b/setup.py
-@@ -387,14 +387,6 @@
+@@ -424,14 +424,6 @@
  def ordinarypath(p):
      return p and p[0] != '.' and p[-1] != '~'
  

Deleted: packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__no_optim_bdiff_armel.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -1,30 +0,0 @@
-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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__optional-dependencies	2012-04-15 16:59:38 UTC (rev 8483)
@@ -26,7 +26,7 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -27,11 +27,12 @@
+@@ -29,11 +29,12 @@
  class MissingTool(Exception):
      pass
  
@@ -65,7 +65,7 @@
              raise util.Abort(_('darcs version 2.1 or newer needed (found %r)') %
                               version)
  
-         if ElementTree is None:
+         if "ElementTree" not in globals():
 -            raise util.Abort(_("Python ElementTree module is not available"))
 +            raise util.Abort(_("Python ElementTree module is not available") +
 +                             _(" (try installing the %s package)") % 'python-celementtree')
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -977,6 +981,8 @@
+@@ -979,6 +983,8 @@
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):

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	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/deb_specific__use_sensible-editor.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1879,8 +1879,8 @@
+@@ -1902,8 +1902,8 @@
      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
-@@ -678,7 +678,7 @@
+@@ -687,7 +687,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -57,7 +57,7 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -8576,8 +8576,8 @@
+@@ -9951,8 +9951,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
@@ -66,9 +66,9 @@
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
  
- #, fuzzy
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13433,7 +13433,7 @@
+ msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
+@@ -15794,7 +15794,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"
@@ -77,7 +77,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -13441,7 +13441,7 @@
+@@ -15802,7 +15802,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"
@@ -150,7 +150,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -9076,8 +9076,8 @@
+@@ -10104,8 +10104,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -161,7 +161,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -14893,7 +14893,8 @@
+@@ -16117,7 +16117,8 @@
  
  msgid ""
  "``editor``\n"
@@ -171,7 +171,7 @@
  msgstr ""
  "``editor``\n"
  "    コミットログ入力用エディタ。 無指定の場合、 ``$EDITOR`` ないし\n"
-@@ -15882,7 +15883,7 @@
+@@ -17116,7 +17117,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"
@@ -180,7 +180,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -15890,7 +15891,7 @@
+@@ -17124,7 +17125,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -191,7 +191,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -10216,10 +10216,10 @@
+@@ -10417,10 +10417,10 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -204,7 +204,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -16234,10 +16234,12 @@
+@@ -16580,10 +16580,12 @@
  
  msgid ""
  "``editor``\n"
@@ -219,7 +219,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -17257,7 +17259,7 @@
+@@ -17603,7 +17605,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"
@@ -228,7 +228,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -17265,7 +17267,7 @@
+@@ -17611,7 +17613,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"
@@ -239,16 +239,18 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -7890,7 +7890,7 @@
+@@ -8717,8 +8717,8 @@
  msgid "Checking commit editor...\n"
- msgstr ""
+ 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"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
- msgstr ""
++msgstr " Ingen arkiveringseditor satt och kan inte hitta sensible-editor i PATH\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -12460,7 +12460,8 @@
+ msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n"
+@@ -13794,7 +13794,8 @@
  
  msgid ""
  "``editor``\n"
@@ -258,7 +260,7 @@
  msgstr ""
  
  msgid ""
-@@ -13126,7 +13127,7 @@
+@@ -14477,7 +14478,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"
@@ -322,7 +324,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
-@@ -1016,7 +1016,8 @@
+@@ -1055,7 +1055,8 @@
      Print debugging information. True or False. Default is False.
  
  ``editor``
@@ -364,16 +366,18 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -7893,7 +7893,7 @@
+@@ -10573,8 +10573,8 @@
  msgid "Checking commit editor...\n"
- msgstr ""
+ msgstr "Проверка редактора сообщений фиксации...\n"
  
 -msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr " Редактор сообщений не установлен и vi не доступен в PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
- msgstr ""
++msgstr " Редактор сообщений не установлен и sensible-editor не доступен в PATH\n"
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13231,10 +13231,12 @@
+ msgstr " (задайте редактор сообщений в вашем конфиге)\n"
+@@ -16647,10 +16647,12 @@
  
  msgid ""
  "``editor``\n"
@@ -382,13 +386,13 @@
 +"    ``sensible-editor``."
  msgstr ""
  "``editor``\n"
--"    Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or ``vi``."
-+"    Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or\n"
+-"    Редактор, вызываемый при фиксации. По умолчанию ``$EDITOR`` or ``vi``."
++"    Редактор, вызываемый при фиксации. По умолчанию ``$EDITOR`` or\n"
 +"    ``sensible-editor``."
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -14204,14 +14206,14 @@
+@@ -17652,14 +17654,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"
@@ -396,8 +400,8 @@
 +"    defaults to 'sensible-editor'."
  msgstr ""
  "EDITOR\n"
- "    Инодга требуется открыть текстовый файл в редакторе, чтобы.\n"
- "    внести изменения, например для написания сообщения коммита.\n"
+ "    Иногда требуется открыть текстовый файл в редакторе, чтобы.\n"
+ "    внести изменения, например для написания сообщения фиксации.\n"
  "    Используемый редактор определяется переменными среды HGEDITOR,\n"
  "    VISUAL и EDITOR, именно в таком порядке. Выбирается первая\n"
 -"    непустая переменная. Если они все пусты, используется 'vi'."

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch (from rev 8424, packages/mercurial/trunk/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/for_upstream__skip_test_gpg_if_not_mercurial_wd.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -0,0 +1,19 @@
+Author: Javi Merino <vicho at debian.org>
+Description: Don't run test-gpg if not in a working directory
+ test-gpg has to be run in a mercurial working directory as it uses
+ that to verify that it hasn't modified the trustdb.gpg file.  Skip
+ the test if it is running in an exploded tarball.
+Forwarded: http://www.selenic.com/pipermail/mercurial-devel/2012-April/038941.html
+--- a/tests/test-gpg.t
++++ b/tests/test-gpg.t
+@@ -1,6 +1,10 @@
+ Test the GPG extension
+ 
+   $ "$TESTDIR/hghave" gpg || exit 80
++  $ if ! hg identify -q > /dev/null; then
++  >     echo "skipped: not a Mercurial working dir" >&2
++  >     exit 80
++  > fi
+   $ cat <<EOF >> $HGRCPATH
+   > [extensions]
+   > gpg=

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch (from rev 8424, packages/mercurial/trunk/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__tests_re_silence_test_bad_pull_log_messages.patch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -0,0 +1,14 @@
+Author: Matt Mackall <mpm at selenic.com>
+Description: tests: re-silence test-bad-pull log messages
+Origin: upstream, http://selenic.com/hg/rev/91eec29dd7de
+
+diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
+--- a/tests/test-bad-pull.t
++++ b/tests/test-bad-pull.t
+@@ -25,6 +25,3 @@
+   abort: HTTP Error 404: * (glob)
+   [255]
+   $ wait $P
+-  $ cat log
+-  localhost - - [*] code 404, message File not found (glob)
+-  localhost - - [*] "GET /foo?cmd=capabilities HTTP/1.1" 404 - (glob)

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/series	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/series	2012-04-15 16:59:38 UTC (rev 8483)
@@ -6,4 +6,6 @@
 proposed_upstream__correct-zeroconf-doc
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
-deb_specific__no_optim_bdiff_armel.patch
+deb_specific__fix_hg-ssh_interpreter.patch
+for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
+from_upstream__tests_re_silence_test_bad_pull_log_messages.patch

Modified: packages/mercurial/branches/squeeze-backports/debian/rules
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/rules	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/rules	2012-04-15 16:59:38 UTC (rev 8483)
@@ -5,15 +5,39 @@
 	dh $@ --with python2
 
 PYVERS=$(shell pyversions -vs)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 override_dh_auto_build: $(PYVERS:%=build-python%)
 	$(MAKE) -C doc man
 	# 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
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+         NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+         PARALLEL_TEST_JOBS := --jobs $(NJOBS)
+endif
+
+ARCH_IS_MIPS := $(if $(subst mips,,$(DEB_HOST_ARCH)),,T)
+ARCH_IS_KFREEBSD-i386 := $(if $(subst kfreebsd-i386,,$(DEB_HOST_ARCH)),,T)
+ARCH_IS_ARMEL := $(if $(subst armel,,$(DEB_HOST_ARCH)),,T)
+ARCH_IS_SPARC := $(if $(subst sparc,,$(DEB_HOST_ARCH)),,T)
+
 override_dh_auto_test:
+# Some tests try to execute two hg commands at the same time to test
+# for corruption.  They do so by running an hg command in the
+# background, sleeping one second and running the second command.  In
+# architectures with slow buildds, one second is not enough and the
+# second test starts before the first one has started printing.  This
+# is hacky and we just enhance the hack by incrementing the sleep time
+# in those architectures.
+ifneq ($(or $(ARCH_IS_MIPS), $(ARCH_IS_KFREEBSD-i386), $(ARCH_IS_ARMEL), $(ARCH_IS_SPARC)),)
+		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t $(CURDIR)/tests/test-pull-pull-corruption2.t
+endif
 
+	dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
+
+	rename.ul .deb-backup '' $(CURDIR)/tests/*
+
 build-python%: mercurial/__version__.py
 	python$* setup.py build
 	touch $@

Modified: packages/mercurial/branches/squeeze-backports/debian/watch
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/watch	2012-04-15 14:04:05 UTC (rev 8482)
+++ packages/mercurial/branches/squeeze-backports/debian/watch	2012-04-15 16:59:38 UTC (rev 8483)
@@ -1,10 +1,5 @@
-# Compulsory line, this is a version 2 file
-version=2
+# format version number, currently 3; this line is compulsory!
+version=3
 
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php mercurial-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
 opts="uversionmangle=s/-rc/~rc/" \
-  http://www.selenic.com/mercurial/release/mercurial-([^s].*)\.tar\.gz
+  http://www.selenic.com/mercurial/release/mercurial-(.*)\.tar\.gz

More information about the Python-apps-commits mailing list