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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Fri Jan 3 20:14:29 UTC 2014 

    Date: Friday, January 3, 2014 @ 20:14:28
  Author: vicho
Revision: 10312

Merge revisions 10047:10231 from trunk into wheezy-backports

Added:
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch
    (from rev 10231, packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch)
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_mo_in_fhs.patch
    (from rev 10231, packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch)
  packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
    (from rev 10231, packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch)
  packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch
    (from rev 10231, packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch)
  packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch
    (from rev 10231, packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch)
Modified:
  packages/mercurial/branches/wheezy-backports/debian/changelog
  packages/mercurial/branches/wheezy-backports/debian/control
  packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install
  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/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
  packages/mercurial/branches/wheezy-backports/debian/patches/series
  packages/mercurial/branches/wheezy-backports/debian/rules
  packages/mercurial/branches/wheezy-backports/debian/tests/control
  packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion
  packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git
Deleted:
  packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
  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

Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,3 +1,63 @@
+mercurial (2.8.1-2) unstable; urgency=low
+
+  * Pass -f to rm so that repeated builds succeed (Closes: #731623).
+  * Fix installation in the case where there is more than one supported
+    version of Python (Closes: #729153).
+    - Thanks to Faheem Mitha <faheem at faheem.info> for the patch.
+  * Make test-shelve.t more lenient. This should hopefully fix the
+    semi-intermittent build failures on some architectures with slower
+    buildds.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Sun, 08 Dec 2013 02:03:54 +0200
+
+mercurial (2.8.1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #731471)
+  * Add myself to Uploaders.
+  * Add patch to fix test-i18n.
+  * Remove pyflakes test to avoid build failures when pyflakes is installed.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Fri, 06 Dec 2013 01:14:40 +0200
+
+mercurial (2.8-3) unstable; urgency=low
+
+  * Fix mercurial-git autopkg test
+  * Add missing deps to run the testsuite with autopkgtest
+  * Increment testsuite timeout to 1440 to prevent timeouts in mips
+  * Move wish to Recommends as it's needed for hg view
+
+ -- Javi Merino <vicho at debian.org>  Sun, 17 Nov 2013 10:13:23 +0000
+
+mercurial (2.8-2) unstable; urgency=medium
+
+  * Increment testsuite timeout to 720 as test-gendoc.t takes a
+    loooong time on armel
+  * Don't run pyflakes on the autopkgtest for the testsuite, it fails to
+    see the pyflakes error it's expecting (but it's not our job to fix
+    python lint issues)
+
+ -- Javi Merino <vicho at debian.org>  Fri, 15 Nov 2013 14:10:00 +0000
+
+mercurial (2.8-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix mercurial-git and hgsubversion autopkgtest by loading the
+    appropriate extension
+  * Bump standards-version to 3.9.5 (no change needed)
+
+ -- Javi Merino <vicho at debian.org>  Fri, 01 Nov 2013 23:19:57 +0000
+
+mercurial (2.8~rc1-1) experimental; urgency=low
+
+  * New upstream release
+  * Fix patches deb_specific__install-help-separately,
+    deb_specific__install-help-separately and
+    deb_specific__install-mo-fhs.patch so that we can run the full
+    testsuite when building
+  * Build-depend on netbase to make test-serve.t work
+
+ -- Javi Merino <vicho at debian.org>  Mon, 21 Oct 2013 22:35:36 +0100
+
 mercurial (2.7.2-1~bpo70+1) wheezy-backports; urgency=low
 
   * Rebuild for wheezy-backports.

Modified: packages/mercurial/branches/wheezy-backports/debian/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/control	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/control	2014-01-03 20:14:28 UTC (rev 10312)
@@ -3,7 +3,8 @@
 Priority: optional
 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>
+ Javi Merino <vicho at debian.org>,
+ Tristan Seligmann <mithrandi at debian.org>
 Build-Depends: debhelper (>= 9),
  patchutils (>= 0.2.25),
  gettext,
@@ -12,8 +13,9 @@
  python-roman,
  zip,
  unzip,
- bash-completion
-Standards-Version: 3.9.4
+ bash-completion,
+ netbase,
+Standards-Version: 3.9.5
 Homepage: http://mercurial.selenic.com/
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
@@ -41,9 +43,9 @@
 Architecture: any 
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020),
  mercurial-common (= ${source:Version})
-Recommends: openssh-client
+Recommends: openssh-client,
+ wish,
 Suggests: qct, 
- wish, 
  vim | emacs,
  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
 Breaks: hgsubversion (<< 1.5~),

Modified: packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial-common.install	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,6 +1,3 @@
-mercurial/help/*.txt usr/share/mercurial/help
-mercurial/templates usr/share/mercurial
-mercurial/locale usr/share
 debian/tmp/usr/lib
 
 contrib/mq.el usr/share/emacs/site-lisp

Deleted: packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/mercurial.test_blacklist	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,56 +0,0 @@
-# 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
-
-# No such file or directory /usr/share/mercurial/help/revsets.txt (?)
-test-bookmarks.t
-test-extension.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
-
-# No hgweb templates
-test-archive.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-non-interactive.t
-test-hgweb-nopath.t
-test-hgweb-no-path-info.t
-test-hgweb-no-request-uri.t
-test-hgweb-raw.t
-test-hgwebdir.t
-test-hgwebdirsym.t
-test-keyword.t
-test-newcgi.t
-test-newercgi.t
-test-oldcgi.t
-test-share.t
-test-websub.t
-
-# local server failed (?)
-test-hgweb-removed.t
-test-largefiles.t
-test-mq-qclone-http.t
-test-mq-qimport.t
-test-obsolete.t
-test-subrepo-relative-path.t
-
-# no port number associated with service 'daytime' (this should be easily solvable)
-test-serve.t

Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-help-separately	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,30 +0,0 @@
-Support installation of help topics handled by mercurial-common.install.
-
---- a/setup.py
-+++ b/setup.py
-@@ -472,8 +472,7 @@ if sys.platform.startswith('linux') and
-         extmodules.append(inotify)
-         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
- 
--packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo',
--                             'help/*.txt']}
-+packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo']}
- 
- def ordinarypath(p):
-     return p and p[0] != '.' and p[-1] != '~'
---- a/mercurial/help.py
-+++ b/mercurial/help.py
-@@ -131,9 +131,11 @@ def loaddoc(topic):
-             module = __file__
-         base = os.path.dirname(module)
- 
-+        docdir = '/usr/share/mercurial/help'
-         for dir in ('.', '..'):
--            docdir = os.path.join(base, dir, 'help')
--            if os.path.isdir(docdir):
-+            tmpdocdir = os.path.join(base, dir, 'help')
-+            if os.path.isdir(tmpdocdir):
-+                docdir = tmpdocdir
-                 break
- 
-         path = os.path.join(docdir, topic + ".txt")

Deleted: 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	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-mo-fhs.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,23 +0,0 @@
-Look for *.mo files in /usr/share/locale (FHS compliant)
---- a/mercurial/i18n.py
-+++ b/mercurial/i18n.py
-@@ -15,7 +15,7 @@ else:
-     module = __file__
- 
- base = os.path.dirname(module)
--for dir in ('.', '..'):
-+for dir in ('.', '..', '/usr/share'):
-     localedir = os.path.join(base, dir, 'locale')
-     if os.path.isdir(localedir):
-         break
---- a/setup.py
-+++ b/setup.py
-@@ -472,7 +472,7 @@ if sys.platform.startswith('linux') and
-         extmodules.append(inotify)
-         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
- 
--packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo']}
-+packagedata = {'mercurial': []}
- 
- def ordinarypath(p):
-     return p and p[0] != '.' and p[-1] != '~'

Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__install-templates-separately	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,30 +0,0 @@
-Support installation of templates handled by mercurial-common.install.
-
---- a/mercurial/templater.py
-+++ b/mercurial/templater.py
-@@ -368,7 +368,7 @@ funcs = {
- 
- # template engine
- 
--path = ['templates', '../templates']
-+path = ['templates', '../templates', '/usr/share/mercurial/templates']
- stringify = templatefilters.stringify
- 
- def _flatten(thing):
---- a/setup.py
-+++ b/setup.py
-@@ -478,14 +478,6 @@ packagedata = {'mercurial': ['locale/*/L
- def ordinarypath(p):
-     return p and p[0] != '.' and p[-1] != '~'
- 
--for root in ('templates',):
--    for curdir, dirs, files in os.walk(os.path.join('mercurial', root)):
--        curdir = curdir.split(os.sep, 1)[1]
--        dirs[:] = filter(ordinarypath, dirs)
--        for f in filter(ordinarypath, files):
--            f = os.path.join(curdir, f)
--            packagedata['mercurial'].append(f)
--
- datafiles = []
- setupversion = version
- extra = {}

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies	2014-01-03 20:14:28 UTC (rev 10312)
@@ -108,7 +108,7 @@
          if self.automatestdio:
 --- a/hgext/convert/subversion.py
 +++ b/hgext/convert/subversion.py
-@@ -19,6 +19,7 @@ from cStringIO import StringIO
+@@ -20,6 +20,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
@@ -116,7 +116,7 @@
  
  try:
      from svn.core import SubversionException, Pool
-@@ -235,16 +236,19 @@ class svn_source(converter_source):
+@@ -236,16 +237,19 @@ class svn_source(converter_source):
              raise NoRepo(_("%s does not look like a Subversion repository")
                           % url)
          if svn is None:
@@ -139,7 +139,7 @@
  
          self.lastrevs = {}
  
-@@ -1023,6 +1027,8 @@ class svn_sink(converter_sink, commandli
+@@ -1024,6 +1028,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
-@@ -204,7 +204,8 @@ class _httprequesthandleropenssl(_httpre
+@@ -207,7 +207,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)
-@@ -245,7 +246,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -248,7 +249,8 @@ class _httprequesthandlerssl(_httpreques
              import ssl
              ssl.wrap_socket
          except ImportError:

Copied: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch (from rev 10231, packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_help_in_fhs.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -0,0 +1,20 @@
+Author: Vernon Tang <vt at foilhead.net>
+Description: Support installation of help topics in FHS.
+Forwarded: not-needed
+
+--- a/mercurial/help.py
++++ b/mercurial/help.py
+@@ -131,9 +131,11 @@ def loaddoc(topic):
+             module = __file__
+         base = os.path.dirname(module)
+ 
++        docdir = '/usr/share/mercurial/help'
+         for dir in ('.', '..'):
+-            docdir = os.path.join(base, dir, 'help')
+-            if os.path.isdir(docdir):
++            tmpdocdir = os.path.join(base, dir, 'help')
++            if os.path.isdir(tmpdocdir):
++                docdir = tmpdocdir
+                 break
+ 
+         path = os.path.join(docdir, topic + ".txt")

Copied: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_mo_in_fhs.patch (from rev 10231, packages/mercurial/trunk/debian/patches/deb_specific__support_mo_in_fhs.patch)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_mo_in_fhs.patch	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_mo_in_fhs.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -0,0 +1,15 @@
+Author: Vincent Danjean <vdanjean at debian.org>
+Description: Look for *.mo files in /usr/share/locale (FHS compliant)
+Forwarded: not-needed
+
+--- a/mercurial/i18n.py
++++ b/mercurial/i18n.py
+@@ -15,7 +15,7 @@ else:
+     module = __file__
+ 
+ base = os.path.dirname(module)
+-for dir in ('.', '..'):
++for dir in ('.', '..', '/usr/share'):
+     localedir = os.path.join(base, dir, 'locale')
+     if os.path.isdir(localedir):
+         break

Copied: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch (from rev 10231, packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -0,0 +1,15 @@
+Author: Vernon Tang <vt at foilhead.net>
+Description: Support installation of templates in FHS.
+Forwarded: not-needed
+
+--- a/mercurial/templater.py
++++ b/mercurial/templater.py
+@@ -373,7 +373,7 @@ funcs = {
+ 
+ # template engine
+ 
+-path = ['templates', '../templates']
++path = ['templates', '../templates', '/usr/share/mercurial/templates']
+ stringify = templatefilters.stringify
+ 
+ def _flatten(thing):

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	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2089,8 +2089,8 @@ def debuginstall(ui):
+@@ -2091,8 +2091,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
-@@ -754,7 +754,7 @@ class ui(object):
+@@ -755,7 +755,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11603,8 +11603,8 @@ msgstr " (テンプレートのインス
+@@ -11950,8 +11950,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -18161,11 +18161,12 @@ msgstr ""
+@@ -18513,11 +18513,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19323,7 +19324,7 @@ msgid ""
+@@ -19675,7 +19676,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"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -19331,7 +19332,7 @@ msgstr ""
+@@ -19683,7 +19684,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11790,10 +11790,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12119,10 +12119,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -18513,10 +18513,12 @@ msgstr ""
+@@ -18854,10 +18854,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19706,7 +19708,7 @@ msgid ""
+@@ -20047,7 +20049,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"
-@@ -19714,7 +19716,7 @@ msgstr ""
+@@ -20055,7 +20057,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"
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -11937,8 +11937,8 @@ msgstr " (шаблоны, похоже,
+@@ -12019,8 +12019,8 @@ msgstr " (шаблоны, похоже,
  msgid "checking commit editor...\n"
  msgstr "проверка редактора сообщений фиксации...\n"
  
@@ -402,7 +402,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (задайте редактор сообщений в вашем конфиге)\n"
-@@ -18557,10 +18557,12 @@ msgstr ""
+@@ -18656,10 +18656,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19733,14 +19735,14 @@ msgid ""
+@@ -19832,14 +19834,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/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -7,10 +7,9 @@
  This fixes it at least in Debian.  I'm unsure about other systems.
 Bug: http://bz.selenic.com/show_bug.cgi?id=4045
 
-diff --git a/tests/run-tests.py b/tests/run-tests.py
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -429,7 +429,7 @@ def usecorrectpython():
+@@ -430,7 +430,7 @@ def usecorrectpython():
               sys.executable)
          mypython = os.path.join(BINDIR, pyexename)
          try:

Copied: packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch (from rev 10231, packages/mercurial/trunk/debian/patches/for_upstream__fix_i18n.patch)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -0,0 +1,17 @@
+Author: Tristan Seligmann <mithrandi at debian.org>
+Description: Add missing import in check-translation.py
+ An import is missing in this script, which in turn causes test-i18n.t to fail.
+Bug: http://bz.selenic.com/show_bug.cgi?id=4122
+
+Index: mercurial-2.8.1/i18n/check-translation.py
+===================================================================
+--- mercurial-2.8.1.orig/i18n/check-translation.py	2013-12-02 04:51:10.000000000 +0200
++++ mercurial-2.8.1/i18n/check-translation.py	2013-12-06 00:20:52.192369115 +0200
+@@ -122,6 +122,7 @@
+     (options, args) = optparser.parse_args()
+ 
+     if options.doctest:
++        import os
+         if 'TERM' in os.environ:
+             del os.environ['TERM']
+         import doctest

Copied: packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch (from rev 10231, packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch	                        (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__lenient_test-shelve.patch	2014-01-03 20:14:28 UTC (rev 10312)
@@ -0,0 +1,28 @@
+Author: Tristan Seligmann <mithrandi at debian.org>
+Description: Make test-shelve.t more lenient
+ When running on a slower system (eg. MIPS buildd), the age of the shelf can be
+ 10 seconds or more, resulting in the output alignment changing and thus a test
+ failure. This patch makes the spacing be matched more leniently.
+Bug: http://bz.selenic.com/show_bug.cgi?id=4124
+
+Index: mercurial-2.8.1/tests/test-shelve.t
+===================================================================
+--- mercurial-2.8.1.orig/tests/test-shelve.t	2013-12-02 04:51:10.000000000 +0200
++++ mercurial-2.8.1/tests/test-shelve.t	2013-12-08 01:28:17.505760594 +0200
+@@ -80,12 +80,12 @@
+ 
+ ensure that our shelved changes exist
+ 
+-  $ hg shelve -l
+-  default-01      (*)    [mq]: second.patch (glob)
+-  default         (*)    [mq]: second.patch (glob)
++  $ sleep 10 && hg shelve -l
++  default-01      (*)* [mq]: second.patch (glob)
++  default         (*)* [mq]: second.patch (glob)
+ 
+   $ hg shelve -l -p default
+-  default         (*)    [mq]: second.patch (glob)
++  default         (*)* [mq]: second.patch (glob)
+   
+   diff --git a/a/a b/a/a
+   --- a/a/a

Modified: packages/mercurial/branches/wheezy-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/series	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/series	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,10 +1,12 @@
-deb_specific__install-templates-separately
-deb_specific__install-help-separately
+deb_specific__support_templates_in_fsh.patch
+deb_specific__support_help_in_fhs.patch
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch
 deb_specific__optional-dependencies
 proposed_upstream__correct-zeroconf-doc
-deb_specific__install-mo-fhs.patch
+deb_specific__support_mo_in_fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
+for_upstream__fix_i18n.patch
+for_upstream__lenient_test-shelve.patch

Modified: packages/mercurial/branches/wheezy-backports/debian/rules
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/rules	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/rules	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,14 +1,18 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 %:
 	dh $@ --with python2,bash-completion
 
 PYVERS=$(shell pyversions -vs)
+PYVER_DEFAULT=$(shell pyversions -vd)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-override_dh_auto_build: $(PYVERS:%=build-python%)
-	$(MAKE) -C doc man
+override_dh_auto_build:
+	$(MAKE) all
 	# 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
 
@@ -35,18 +39,14 @@
 		sed -i.deb-backup -e 's/sleep 1/sleep 2/' $(CURDIR)/tests/test-pull-pull-corruption.t
 endif
 
-	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 480 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
+	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS)"
 
 	rename.ul .deb-backup '' $(CURDIR)/tests/*
 endif
 
-build-python%: mercurial/__version__.py
-	python$* setup.py build
-	touch $@
-
 override_dh_auto_install: $(PYVERS:%=install-python%)
 
-install-python%: build-python%
+install-python%:
 	python$* setup.py install --root $(CURDIR)/debian/tmp --install-layout=deb
 	# Do not hardcode the python interpreter
 	sed -i '1c#!/usr/bin/python' debian/tmp/usr/bin/hg
@@ -77,6 +77,17 @@
 	install -m 644 \
 		debian/cacerts.hgrc \
 		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/cacerts.rc
+	# Move templates and help installed by setup.py to their FHS-correct location
+	mv $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/templates \
+	   $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/help \
+	   $(CURDIR)/debian/mercurial-common/usr/share/mercurial
+	mv $(CURDIR)/debian/mercurial-common/usr/lib/python$(PYVER_DEFAULT)/dist-packages/mercurial/locale \
+	   $(CURDIR)/debian/mercurial-common/usr/share
+	# If more than one Python version is supported, clean up the templates
+	# and help installed for the other versions
+	-rm -rf $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/templates \
+	        $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/help \
+	        $(CURDIR)/debian/mercurial-common/usr/lib/python*/dist-packages/mercurial/locale \
 	# remove arch-dependent python stuff
 	find debian/mercurial-common/usr/lib \
 		-name '*.so' ! -type d -delete , \
@@ -91,8 +102,11 @@
 	dh_auto_clean
 	mv mercurial/__version__.py.save mercurial/__version__.py
 	$(RM) -rv tmp/
-	$(RM) build-python*
 
+override_dh_clean:
+	dh_clean
+	-rm -f tests/test-check-pyflakes.t
+
 mercurial/__version__.py:
 	@echo "$@ is missing (you probably call 'make clean' directly)."
 	@echo "Restore it from sources before building the package"

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/control
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/control	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/control	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,5 +1,5 @@
 Tests: testsuite
-Depends: @, python-subversion, monotone, cvs, bzr, tla, darcs, pyflakes
+Depends: @, zip, unzip, netbase, python-subversion, monotone, cvs, bzr, tla, darcs
 
 Tests: hgsubversion
 Depends: @, hgsubversion

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/hgsubversion	2014-01-03 20:14:28 UTC (rev 10312)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec hg clone svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
+exec hg --config extensions.hgsubversion= clone svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/

Modified: packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git	2014-01-03 20:08:12 UTC (rev 10311)
+++ packages/mercurial/branches/wheezy-backports/debian/tests/mercurial-git	2014-01-03 20:14:28 UTC (rev 10312)
@@ -2,8 +2,9 @@
 
 git init try
 cd try
+git config user.email babar at jungle.org
 echo a >a
 git add a
 git commit -m a
 cd ..
-hg clone try try2
+exec hg --config extensions.git= clone try try2

More information about the Python-apps-commits mailing list