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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Mon Aug 3 20:07:06 UTC 2015 

    Date: Monday, August 3, 2015 @ 20:07:05
  Author: vicho
Revision: 12183

merge trunk 11333:12083 into jessie-backports

Added:
  packages/mercurial/branches/jessie-backports/debian/cacerts.rc
    (from rev 12083, packages/mercurial/trunk/debian/cacerts.rc)
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch
    (from rev 12083, packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch)
Modified:
  packages/mercurial/branches/jessie-backports/debian/changelog
  packages/mercurial/branches/jessie-backports/debian/control
  packages/mercurial/branches/jessie-backports/debian/mercurial-common.examples
  packages/mercurial/branches/jessie-backports/debian/mercurial-common.install
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
  packages/mercurial/branches/jessie-backports/debian/patches/series
  packages/mercurial/branches/jessie-backports/debian/rules
  packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion
Deleted:
  packages/mercurial/branches/jessie-backports/debian/cacerts.hgrc
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_help_in_fhs.patch
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_mo_in_fhs.patch
  packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
  packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__lenient_test-shelve.patch
  packages/mercurial/branches/jessie-backports/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch

Deleted: packages/mercurial/branches/jessie-backports/debian/cacerts.hgrc
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/cacerts.hgrc	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/cacerts.hgrc	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,5 +0,0 @@
-[web]
-# user can disable this Debian default by overriding this option in ~/.hgrc
-# and/or using the --insecure command line switch
-cacerts = /etc/ssl/certs/ca-certificates.crt
-

Copied: packages/mercurial/branches/jessie-backports/debian/cacerts.rc (from rev 12083, packages/mercurial/trunk/debian/cacerts.rc)
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/cacerts.rc	                        (rev 0)
+++ packages/mercurial/branches/jessie-backports/debian/cacerts.rc	2015-08-03 20:07:05 UTC (rev 12183)
@@ -0,0 +1,5 @@
+[web]
+# user can disable this Debian default by overriding this option in ~/.hgrc
+# and/or using the --insecure command line switch
+cacerts = /etc/ssl/certs/ca-certificates.crt
+

Modified: packages/mercurial/branches/jessie-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/changelog	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/changelog	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,3 +1,86 @@
+mercurial (3.4.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Drop "XS-Testsuite" as it's no longer needed
+  * Fix "FTBFS: recipe for target 'override_dh_auto_test' failed"
+    by using rename.  util-linux no longer provides rename.ul (Closes: #790266)
+
+ -- Javi Merino <vicho at debian.org>  Wed, 08 Jul 2015 22:31:18 +0100
+
+mercurial (3.4-1) unstable; urgency=medium
+
+  * New upstream release
+  * Delete patch for_upstream__fix_typo_in_man_page.patch as it is applied
+    upstream
+  * Update breaks of hgsubversion to versions prior to 1.8-1
+  * Upload to unstable
+
+ -- Javi Merino <vicho at debian.org>  Sat, 02 May 2015 10:01:10 +0100
+
+mercurial (3.4~rc1-1) experimental; urgency=medium
+
+  * New upstream release
+  * Delete patch for_upstream__lenient_test-shelve.patch which is
+    applied upstream
+  * Remove trailing spaces from empty lines in the descriptions.  It
+    upsets lintian
+  * Add patch for_upstream__fix_typo_in_man_page.patch to fix a typo
+    spotted by lintian
+
+ -- Javi Merino <vicho at debian.org>  Sun, 19 Apr 2015 15:41:25 +0100
+
+mercurial (3.3.2-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Fri, 13 Mar 2015 13:38:04 +0000
+
+mercurial (3.3-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Mon, 09 Feb 2015 05:48:23 +0800
+
+mercurial (3.3~rc1-1) experimental; urgency=medium
+
+  * New upstream release
+  * move the installation of mergetools.rc to mercurial-common.install
+
+ -- Javi Merino <vicho at debian.org>  Sat, 31 Jan 2015 17:48:59 +0100
+
+mercurial (3.2.3-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Fri, 19 Dec 2014 22:29:28 +0000
+
+mercurial (3.2.1-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Javi Merino <vicho at debian.org>  Fri, 14 Nov 2014 08:35:25 +0000
+
+mercurial (3.2-1) experimental; urgency=medium
+
+  * New upstream release (Closes: #768022)
+  * Replace deb_specific__support_templates_in_fsh.patch,
+    deb_specific__support_help_in_fhs.patch and
+    deb_specific__support_mo_in_fhs.patch with
+    deb_specific__fix_fhs_paths.py as the mechanism to specify the path to
+    datafiles has been unified.
+  * Remove from_upstream__test-
+    patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
+    as it is now included upstream
+  * Bump standards-version to 3.9.6 (no change needed)
+  * Build-depend on dh-python
+  * Simplify installation of /etc/mercurial/hgrc.d/cacerts.rc
+  * Remove sample.hgrc from the examples as it's now removed in upstream
+    (full of bad suggestions)
+  * Update breaks for mercurial-git and hgsubversion: current versions
+    don't work
+
+ -- Javi Merino <vicho at debian.org>  Mon, 10 Nov 2014 08:34:13 +0000
+
 mercurial (3.1.2-2+deb8u1) jessie-security; urgency=high
 
   * Fix "CVE-2014-9462" by adding patch

Modified: packages/mercurial/branches/jessie-backports/debian/control
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/control	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/control	2015-08-03 20:07:05 UTC (rev 12183)
@@ -6,6 +6,7 @@
  Javi Merino <vicho at debian.org>,
  Tristan Seligmann <mithrandi at debian.org>
 Build-Depends: debhelper (>= 9),
+ dh-python,
  patchutils (>= 0.2.25),
  gettext,
  python-all-dev (>= 2.6.6-3~),
@@ -15,13 +16,11 @@
  unzip,
  bash-completion,
  netbase,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 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/
 X-Python-Version: >= 2.4
-# Can go away once dpkg 1.17.11 hits stable
-XS-Testsuite: autopkgtest
 
 Package: mercurial-common
 Architecture: all 
@@ -40,7 +39,7 @@
 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.
- . 
+ .
  This package contains the architecture independent components of Mercurial,
  and is generally useless without the mercurial package.
 
@@ -51,14 +50,14 @@
 Recommends: openssh-client,
 Suggests: qct,
  kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
-Breaks: hgsubversion (<< 1.6~),
+Breaks: hgsubversion (<< 1.8-1),
  hgview-common (<< 1.8.1),
- mercurial-git (<< 0.6.1-1~),
+ mercurial-git (<= 0.6.1-2),
  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.
- . 
+ .
  Its features include:
   * O(1) delta-compressed file storage and retrieval scheme
   * Complete cross-indexing of files and changesets for efficient exploration

Modified: packages/mercurial/branches/jessie-backports/debian/mercurial-common.examples
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/mercurial-common.examples	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/mercurial-common.examples	2015-08-03 20:07:05 UTC (rev 12183)
@@ -6,7 +6,6 @@
 contrib/mercurial.el
 contrib/perf.py
 contrib/python-hook-examples.py
-contrib/sample.hgrc
 contrib/simplemerge
 contrib/tcsh_completion
 contrib/tcsh_completion_build.sh

Modified: packages/mercurial/branches/jessie-backports/debian/mercurial-common.install
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/mercurial-common.install	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/mercurial-common.install	2015-08-03 20:07:05 UTC (rev 12183)
@@ -7,4 +7,7 @@
 
 contrib/hg-ssh usr/bin
 
+mercurial/default.d/mergetools.rc etc/mercurial/hgrc.d/
+
 debian/hgrc etc/mercurial/
+debian/cacerts.rc etc/mercurial/hgrc.d/

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -8,14 +8,13 @@
 Bug-Debian: http://bugs.debian.org/620087
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250
 Forwarded: not-needed
-Last-Update: 2011-03-30
- 
+
 --- a/setup.py
 +++ b/setup.py
-@@ -422,7 +422,6 @@ cmdclass = {'build': hgbuild,
-             'build_ext': hgbuildext,
+@@ -471,7 +471,6 @@ cmdclass = {'build': hgbuild,
              'build_py': hgbuildpy,
              'build_hgextindex': buildhgextindex,
+             'install_lib': hginstalllib,
 -            'install_scripts': hginstallscripts,
              'build_hgexe': buildhgexe,
              }

Copied: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch (from rev 12083, packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch)
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch	                        (rev 0)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -0,0 +1,20 @@
+Description: Use FHS compliant path for data
+ By default, mercurial installs expects its data files next to their
+ py files in /usr/lib/python2.7/dist-packages/mercurial .  Debian puts
+ the data files in the FHS compliant /usr/share/mercurial .  Fix the
+ path only when run from the FHS compliant path
+ (/usr/lib/pythonX.Y/dist-packages/mercurial) so as to not break the
+ testsuite when building the package.
+Author: Javi Merino <vicho at debian.org>
+
+--- a/mercurial/util.py
++++ b/mercurial/util.py
+@@ -621,6 +621,8 @@ def mainfrozen():
+ if mainfrozen():
+     # executable version (py2exe) doesn't support __file__
+     datapath = os.path.dirname(sys.executable)
++elif __file__.startswith("/usr/lib/python"):
++    datapath = "/usr/share/mercurial"
+ else:
+     datapath = os.path.dirname(__file__)
+ 

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__hgk.py.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -2,11 +2,11 @@
 
 --- a/hgext/hgk.py
 +++ b/hgext/hgk.py
-@@ -343,6 +343,6 @@ def view(ui, repo, *etc, **opts):
-     "start interactive history viewer"
-     os.chdir(repo.root)
-     optstr = ' '.join(['--%s %s' % (k, v) for k, v in opts.iteritems() if v])
+@@ -326,6 +326,6 @@ def view(ui, repo, *etc, **opts):
+     if repo.filtername is None:
+         optstr += '--hidden'
+ 
 -    cmd = ui.config("hgk", "path", "hgk") + " %s %s" % (optstr, " ".join(etc))
 +    cmd = ui.config("hgk", "path", "/usr/share/mercurial/hgk") + " %s %s" % (optstr, " ".join(etc))
      ui.debug("running %s\n" % cmd)
-     util.system(cmd)
+     ui.system(cmd)

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies	2015-08-03 20:07:05 UTC (rev 12183)
@@ -26,7 +26,7 @@
          self._checkrepotype(path)
 --- a/hgext/convert/common.py
 +++ b/hgext/convert/common.py
-@@ -28,11 +28,12 @@ def decodeargs(s):
+@@ -28,14 +28,15 @@ def decodeargs(s):
  class MissingTool(Exception):
      pass
  
@@ -34,7 +34,10 @@
 +def checktool(exe, name=None, abort=True, debname=None):
      name = name or exe
      if not util.findexe(exe):
-         exc = abort and util.Abort or MissingTool
+         if abort:
+             exc = util.Abort
+         else:
+             exc = MissingTool
 -        raise exc(_('cannot find required "%s" tool') % name)
 +        raise exc(_('cannot find required "%s" tool') % name +
 +                  (debname and _(' (try installing the %s package)') % debname or ''))
@@ -74,9 +77,9 @@
  
 --- a/hgext/convert/git.py
 +++ b/hgext/convert/git.py
-@@ -94,7 +94,7 @@ class convert_git(converter_source):
-         if not os.path.exists(path + "/objects"):
-             raise NoRepo(_("%s does not look like a Git repository") % path)
+@@ -107,7 +107,7 @@ class convert_git(converter_source):
+         else:
+             self.simopt = ''
  
 -        checktool('git', 'git')
 +        checktool('git', 'git', debname='git-core')
@@ -139,7 +142,7 @@
  
          self.lastrevs = {}
  
-@@ -1069,6 +1073,8 @@ class svn_sink(converter_sink, commandli
+@@ -1089,6 +1093,8 @@ class svn_sink(converter_sink, commandli
          return self.join('hg-authormap')
  
      def __init__(self, ui, path):
@@ -150,23 +153,23 @@
          commandline.__init__(self, ui, 'svn')
 --- a/mercurial/hgweb/server.py
 +++ b/mercurial/hgweb/server.py
-@@ -207,7 +207,8 @@ class _httprequesthandleropenssl(_httpre
+@@ -208,7 +208,8 @@ class _httprequesthandleropenssl(_httpre
              import OpenSSL
              OpenSSL.SSL.Context
          except ImportError:
 -            raise util.Abort(_("SSL support is unavailable"))
 +            raise util.Abort(_("SSL support is unavailable") +
 +                             _(" (try installing the %s package)") % 'python-openssl')
-         ctx = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD)
+         ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
          ctx.use_privatekey_file(ssl_cert)
          ctx.use_certificate_file(ssl_cert)
-@@ -248,7 +249,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -249,7 +250,8 @@ class _httprequesthandlerssl(_httpreques
              import ssl
              ssl.wrap_socket
          except ImportError:
 -            raise util.Abort(_("SSL support is unavailable"))
 +            raise util.Abort(_("SSL support is unavailable") +
 +                             _(" (try installing the %s package)") % 'python-openssl')
-         httpserver.socket = ssl.wrap_socket(httpserver.socket, server_side=True,
-             certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv23)
- 
+         httpserver.socket = ssl.wrap_socket(
+             httpserver.socket, server_side=True,
+             certfile=ssl_cert, ssl_version=ssl.PROTOCOL_TLSv1)

Deleted: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_help_in_fhs.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_help_in_fhs.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_help_in_fhs.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,20 +0,0 @@
-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
-@@ -134,9 +134,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/jessie-backports/debian/patches/deb_specific__support_mo_in_fhs.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_mo_in_fhs.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_mo_in_fhs.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,15 +0,0 @@
-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

Deleted: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_templates_in_fsh.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__support_templates_in_fsh.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,15 +0,0 @@
-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
-@@ -530,7 +530,7 @@ funcs = {
- 
- # template engine
- 
--path = ['templates', '../templates']
-+path = ['templates', '../templates', '/usr/share/mercurial/templates']
- stringify = templatefilters.stringify
- 
- def _flatten(thing):

Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -13,8 +13,8 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2256,8 +2256,8 @@ def debuginstall(ui):
-     editor = ui.geteditor()
+@@ -2373,8 +2373,8 @@ def debuginstall(ui):
+     editor = util.expandpath(editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
      if not cmdpath:
 -        if editor == 'vi':
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -791,7 +791,7 @@ class ui(object):
+@@ -879,7 +879,7 @@ class ui(object):
              # avoid confusion.
              editor = 'E'
          else:
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12019,8 +12019,8 @@ msgstr " (テンプレートのインス
+@@ -12448,8 +12448,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"
-@@ -18904,11 +18904,12 @@ msgstr ""
+@@ -19985,11 +19985,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20111,7 +20112,7 @@ msgid ""
+@@ -21208,7 +21209,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"
-@@ -20119,7 +20120,7 @@ msgstr ""
+@@ -21216,7 +21217,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12213,10 +12213,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12637,10 +12637,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 ""
-@@ -19275,10 +19275,12 @@ msgstr ""
+@@ -20377,10 +20377,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20513,7 +20515,7 @@ msgid ""
+@@ -21631,7 +21633,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"
-@@ -20521,7 +20523,7 @@ msgstr ""
+@@ -21639,7 +21641,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"
@@ -349,7 +349,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/mercurial/help/config.txt
 +++ b/mercurial/help/config.txt
-@@ -1250,7 +1250,8 @@ User interface controls.
+@@ -1359,7 +1359,8 @@ User interface controls.
      Print debugging information. True or False. Default is False.
  
  ``editor``
@@ -391,7 +391,7 @@
  msgid ""
 --- a/i18n/ru.po
 +++ b/i18n/ru.po
-@@ -12441,8 +12441,8 @@ msgstr " (шаблоны, похоже,
+@@ -12451,8 +12451,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"
-@@ -19430,10 +19430,12 @@ msgstr ""
+@@ -19448,10 +19448,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -417,7 +417,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -20651,14 +20653,14 @@ msgid ""
+@@ -20669,14 +20671,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/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -9,7 +9,7 @@
 
 --- a/tests/run-tests.py
 +++ b/tests/run-tests.py
-@@ -1635,7 +1635,7 @@ class TestRunner(object):
+@@ -1858,7 +1858,7 @@ class TestRunner(object):
                   sys.executable)
              mypython = os.path.join(self._tmpbindir, pyexename)
              try:

Deleted: packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__lenient_test-shelve.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__lenient_test-shelve.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,24 +0,0 @@
-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
-
---- a/tests/test-shelve.t
-+++ b/tests/test-shelve.t
-@@ -79,11 +79,11 @@ the common case - no options or filename
- ensure that our shelved changes exist
- 
-   $ hg shelve -l
--  default-01      (*)    changes to '[mq]: second.patch' (glob)
--  default         (*)    changes to '[mq]: second.patch' (glob)
-+  default-01      (*)* changes to '[mq]: second.patch' (glob)
-+  default         (*)* changes to '[mq]: second.patch' (glob)
- 
-   $ hg shelve -l -p default
--  default         (*)    changes to '[mq]: second.patch' (glob)
-+  default         (*)* changes to '[mq]: second.patch' (glob)
-   
-   diff --git a/a/a b/a/a
-   --- a/a/a

Deleted: packages/mercurial/branches/jessie-backports/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,136 +0,0 @@
-From: Augie Fackler <raf at durin42.com>
-Origin: upstream, http://selenic.com/repo/hg/rev/f8fc5df6a8cf
-Subject: test-patchbomb.t: work around Python change d579866d6419 (issue4188)
-
-Python 2.7.7 and later (as well as some ubuntu/debian packages of
-2.7.6) include a fix that makes the email module more pedantically
-correct for MIME boundaries, but this breaks our tests. We work around
-this by filtering the output of any 'hg email' invocations in the test
-that produce MIME messages.
-
-diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t
---- a/tests/test-patchbomb.t
-+++ b/tests/test-patchbomb.t
-@@ -8,6 +8,21 @@ Mercurial-patchbomb/.* -> Mercurial-patc
- --===+[0-9]+=+--$ -> --===*=-- (glob)
- --===+[0-9]+=+$ -> --===*= (glob)
- 
-+  $ cat > prune-blank-after-boundary.py <<EOF
-+  > import sys
-+  > skipblank = False
-+  > trim = lambda x: x.strip(' \r\n')
-+  > for l in sys.stdin:
-+  >     if trim(l).endswith('=--') or trim(l).endswith('=='):
-+  >         skipblank = True
-+  >         print l,
-+  >         continue
-+  >     if not trim(l) and skipblank:
-+  >         continue
-+  >     skipblank = False
-+  >     print l,
-+  > EOF
-+  $ FILTERBOUNDARY="python `pwd`/prune-blank-after-boundary.py"
-   $ echo "[extensions]" >> $HGRCPATH
-   $ echo "patchbomb=" >> $HGRCPATH
- 
-@@ -214,7 +229,7 @@ Mercurial-patchbomb/.* -> Mercurial-patc
- 
- test bundle and description:
-   $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \
--  >  -c bar -s test -r tip -b --desc description
-+  >  -c bar -s test -r tip -b --desc description | $FILTERBOUNDARY
-   searching for changes
-   1 changesets found
-   
-@@ -689,7 +704,7 @@ test diffstat for multiple patches:
-   
- 
- test inline for single patch:
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   
-@@ -732,7 +747,7 @@ test inline for single patch:
- 
- 
- test inline for single patch (quoted-printable):
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   
-@@ -791,7 +806,7 @@ test inline for single patch (quoted-pri
- 
- test inline for multiple patches:
-   $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
--  >  -r 0:1 -r 4
-+  >  -r 0:1 -r 4 | $FILTERBOUNDARY
-   this patch series consists of 3 patches.
-   
-   
-@@ -943,7 +958,7 @@ test inline for multiple patches:
-   --===*=-- (glob)
- 
- test attach for single patch:
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   
-@@ -994,7 +1009,7 @@ test attach for single patch:
-   --===*=-- (glob)
- 
- test attach for single patch (quoted-printable):
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   
-@@ -1061,7 +1076,7 @@ test attach for single patch (quoted-pri
-   --===*=-- (glob)
- 
- test attach and body for single patch:
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   
-@@ -1123,7 +1138,7 @@ test attach and body for single patch:
- 
- test attach for multiple patches:
-   $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
--  >  -r 0:1 -r 4
-+  >  -r 0:1 -r 4 | $FILTERBOUNDARY
-   this patch series consists of 3 patches.
-   
-   
-@@ -1579,7 +1594,8 @@ tagging csets:
-   $ hg tag -r2 two two.diff
- 
- test inline for single named patch:
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
-+  >   -r 2 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   
-@@ -1621,7 +1637,8 @@ test inline for single named patch:
-   --===*=-- (glob)
- 
- test inline for multiple named/unnamed patches:
--  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1
-+  $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
-+  >    -r 0:1 | $FILTERBOUNDARY
-   this patch series consists of 2 patches.
-   
-   
-@@ -1927,7 +1944,7 @@ test single flag for single patch (and n
-   $ hg up -qr1
-   $ echo dirt > a
-   $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
--  >  -r 2
-+  >  -r 2 | $FILTERBOUNDARY
-   this patch series consists of 1 patches.
-   
-   

Modified: packages/mercurial/branches/jessie-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/series	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/patches/series	2015-08-03 20:07:05 UTC (rev 12183)
@@ -1,15 +1,7 @@
-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__support_mo_in_fhs.patch
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
-for_upstream__lenient_test-shelve.patch
-from_upstream__test-patchbomb_t_work_around_Python_change_d579866d6419_issue4188.patch
-from_upstream__encoding_add_hfsignoreclean_to_clean_out_HFS-ignored_characters.patch
-from_upstream__pathauditor_check_for_codepoints_ignored_on_OS_X.patch
-from_upstream__pathauditor_check_for_Windows_shortname_aliases.patch
-from_upstream__sshpeer_more_thorough_shell_quoting.patch
+deb_specific__fix_fhs_paths.patch

Modified: packages/mercurial/branches/jessie-backports/debian/rules
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/rules	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/rules	2015-08-03 20:07:05 UTC (rev 12183)
@@ -41,7 +41,7 @@
 
 	http_proxy='' dh_auto_test -- TESTFLAGS="--verbose --timeout 1440 $(PARALLEL_TEST_JOBS) --blacklist $(CURDIR)/debian/mercurial.test_blacklist"
 
-	rename.ul .deb-backup '' $(CURDIR)/tests/*
+	rename 's/\.deb-backup$$//' $(CURDIR)/tests/*
 endif
 
 override_dh_auto_install: $(PYVERS:%=install-python%)
@@ -65,15 +65,6 @@
 		-type d -empty -delete
 
 install-archindep:
-	# Install system-wide conffiles.  Note the rename from .hgrc
-	# to .rc, which dh_install can't do if you list the file in
-	# mercurial-common.install
-	install -m 644 \
-		contrib/mergetools.hgrc \
-		$(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/mergetools.rc
-	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 \

Modified: packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion	2015-08-03 19:48:31 UTC (rev 12182)
+++ packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion	2015-08-03 20:07:05 UTC (rev 12183)
@@ -43,6 +43,6 @@
 
 # Kill the server and cleanup
 kill $(cat $PID_FILE)
-rm -r $SVN_ROOT
+rm -rf $SVN_ROOT
 
 rm -r celesteville

More information about the Python-apps-commits mailing list