[Python-apps-commits] r14467 - in packages/mercurial/trunk/debian (11 files)
mithrandi at users.alioth.debian.org
mithrandi at users.alioth.debian.org
Mon Nov 13 05:07:43 UTC 2017
Date: Monday, November 13, 2017 @ 05:07:37
Author: mithrandi
Revision: 14467
Refresh patches, remove patches applied upstream.
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
packages/mercurial/trunk/debian/patches/series
Deleted:
packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch
packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/changelog 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,6 +1,7 @@
mercurial (4.4.1-1) unstable; urgency=medium
* New upstream release.
+ - Refresh patches, remove patches applied upstream.
-- Tristan Seligmann <mithrandi at debian.org> Mon, 13 Nov 2017 06:19:31 +0200
Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -9,11 +9,11 @@
Bug-Ubuntu: https://bugs.launchpad.net/bugs/745250
Forwarded: not-needed
-Index: mercurial-4.3.1/setup.py
+Index: mercurial-4.4.1/setup.py
===================================================================
---- mercurial-4.3.1.orig/setup.py 2017-08-11 05:08:30.215428426 +0200
-+++ mercurial-4.3.1/setup.py 2017-08-11 05:08:30.215428426 +0200
-@@ -699,7 +699,6 @@
+--- mercurial-4.4.1.orig/setup.py 2017-11-13 07:05:05.674348183 +0200
++++ mercurial-4.4.1/setup.py 2017-11-13 07:05:05.670348114 +0200
+@@ -753,7 +753,6 @@
'build_hgextindex': buildhgextindex,
'install': hginstall,
'install_lib': hginstalllib,
Modified: packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -7,11 +7,11 @@
testsuite when building the package.
Author: Javi Merino <vicho at debian.org>
-Index: mercurial-4.3.1/mercurial/util.py
+Index: mercurial-4.4.1/mercurial/util.py
===================================================================
---- mercurial-4.3.1.orig/mercurial/util.py 2017-08-11 05:08:43.163643090 +0200
-+++ mercurial-4.3.1/mercurial/util.py 2017-08-11 05:09:20.020254166 +0200
-@@ -988,6 +988,8 @@
+--- mercurial-4.4.1.orig/mercurial/util.py 2017-11-13 07:05:09.546415215 +0200
++++ mercurial-4.4.1/mercurial/util.py 2017-11-13 07:05:09.542415144 +0200
+@@ -1094,6 +1094,8 @@
if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(pycompat.sysexecutable)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,14 +1,15 @@
Set default hgk path for hgk outside bin.
-Index: mercurial-4.3.1/hgext/hgk.py
+Index: mercurial-4.4.1/hgext/hgk.py
===================================================================
---- mercurial-4.3.1.orig/hgext/hgk.py 2017-08-11 05:08:13.663154020 +0200
-+++ mercurial-4.3.1/hgext/hgk.py 2017-08-11 05:08:13.659153953 +0200
-@@ -345,6 +345,6 @@
- if repo.filtername is None:
- optstr += '--hidden'
+--- mercurial-4.4.1.orig/hgext/hgk.py 2017-11-13 07:03:35.564787794 +0200
++++ mercurial-4.4.1/hgext/hgk.py 2017-11-13 07:04:16.637499141 +0200
+@@ -65,7 +65,7 @@
+ configitem = registrar.configitem(configtable)
-- 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)
- ui.system(cmd, blockedtag='hgk_view')
+ configitem('hgk', 'path',
+- default='hgk',
++ default='/usr/share/mercurial/hgk',
+ )
+
+ @command('debug-diff-tree',
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,10 +1,10 @@
Suggest Debian packages for some optional dependencies.
-Index: mercurial-4.3.1/hgext/bugzilla.py
+Index: mercurial-4.4.1/hgext/bugzilla.py
===================================================================
---- mercurial-4.3.1.orig/hgext/bugzilla.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/bugzilla.py 2017-08-11 05:08:19.127244603 +0200
-@@ -456,7 +456,8 @@
+--- mercurial-4.4.1.orig/hgext/bugzilla.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/bugzilla.py 2017-11-13 07:04:57.786211622 +0200
+@@ -451,7 +451,8 @@
import MySQLdb as mysql
bzmysql._MySQLdb = mysql
except ImportError as err:
@@ -14,11 +14,11 @@
bzaccess.__init__(self, ui)
-Index: mercurial-4.3.1/hgext/convert/bzr.py
+Index: mercurial-4.4.1/hgext/convert/bzr.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/bzr.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/bzr.py 2017-08-11 05:08:19.127244603 +0200
-@@ -54,7 +54,8 @@
+--- mercurial-4.4.1.orig/hgext/convert/bzr.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/bzr.py 2017-11-13 07:04:57.790211691 +0200
+@@ -55,7 +55,8 @@
# access bzrlib stuff
bzrdir
except NameError:
@@ -28,11 +28,11 @@
path = os.path.abspath(path)
self._checkrepotype(path)
-Index: mercurial-4.3.1/hgext/convert/common.py
+Index: mercurial-4.4.1/hgext/convert/common.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/common.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/common.py 2017-08-11 05:08:19.127244603 +0200
-@@ -39,14 +39,15 @@
+--- mercurial-4.4.1.orig/hgext/convert/common.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/common.py 2017-11-13 07:04:57.790211691 +0200
+@@ -40,14 +40,15 @@
class MissingTool(Exception):
pass
@@ -50,10 +50,10 @@
class NoRepo(Exception):
pass
-Index: mercurial-4.3.1/hgext/convert/cvs.py
+Index: mercurial-4.4.1/hgext/convert/cvs.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/cvs.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/cvs.py 2017-08-11 05:08:19.127244603 +0200
+--- mercurial-4.4.1.orig/hgext/convert/cvs.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/cvs.py 2017-11-13 07:04:57.790211691 +0200
@@ -39,7 +39,7 @@
if not os.path.exists(cvs):
raise NoRepo(_("%s does not look like a CVS checkout") % path)
@@ -63,10 +63,10 @@
self.changeset = None
self.files = {}
-Index: mercurial-4.3.1/hgext/convert/darcs.py
+Index: mercurial-4.4.1/hgext/convert/darcs.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/darcs.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/darcs.py 2017-08-11 05:08:19.127244603 +0200
+--- mercurial-4.4.1.orig/hgext/convert/darcs.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/darcs.py 2017-11-13 07:04:57.790211691 +0200
@@ -49,14 +49,15 @@
if not os.path.exists(os.path.join(path, '_darcs')):
raise NoRepo(_("%s does not look like a darcs repository") % path)
@@ -85,11 +85,11 @@
self.path = os.path.realpath(path)
-Index: mercurial-4.3.1/hgext/convert/git.py
+Index: mercurial-4.4.1/hgext/convert/git.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/git.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/git.py 2017-08-11 05:08:19.127244603 +0200
-@@ -97,7 +97,7 @@
+--- mercurial-4.4.1.orig/hgext/convert/git.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/git.py 2017-11-13 07:04:57.790211691 +0200
+@@ -95,7 +95,7 @@
else:
self.simopt = []
@@ -98,10 +98,10 @@
self.path = path
self.submodules = []
-Index: mercurial-4.3.1/hgext/convert/gnuarch.py
+Index: mercurial-4.4.1/hgext/convert/gnuarch.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/gnuarch.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/gnuarch.py 2017-08-11 05:08:19.127244603 +0200
+--- mercurial-4.4.1.orig/hgext/convert/gnuarch.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/gnuarch.py 2017-11-13 07:04:57.790211691 +0200
@@ -51,7 +51,8 @@
if util.findexe('tla'):
self.execmd = 'tla'
@@ -112,10 +112,10 @@
common.commandline.__init__(self, ui, self.execmd)
-Index: mercurial-4.3.1/hgext/convert/monotone.py
+Index: mercurial-4.4.1/hgext/convert/monotone.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/monotone.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/monotone.py 2017-08-11 05:08:19.127244603 +0200
+--- mercurial-4.4.1.orig/hgext/convert/monotone.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/monotone.py 2017-11-13 07:04:57.790211691 +0200
@@ -75,7 +75,7 @@
self.files = None
self.dirs = None
@@ -125,10 +125,10 @@
def mtnrun(self, *args, **kwargs):
if self.automatestdio:
-Index: mercurial-4.3.1/hgext/convert/subversion.py
+Index: mercurial-4.4.1/hgext/convert/subversion.py
===================================================================
---- mercurial-4.3.1.orig/hgext/convert/subversion.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/hgext/convert/subversion.py 2017-08-11 05:08:19.127244603 +0200
+--- mercurial-4.4.1.orig/hgext/convert/subversion.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/hgext/convert/subversion.py 2017-11-13 07:04:57.790211691 +0200
@@ -295,16 +295,19 @@
raise NoRepo(_("%s does not look like a Subversion repository")
% url)
@@ -152,7 +152,7 @@
self.lastrevs = {}
-@@ -1111,6 +1114,8 @@
+@@ -1113,6 +1116,8 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
@@ -161,11 +161,11 @@
converter_sink.__init__(self, ui, path)
commandline.__init__(self, ui, 'svn')
-Index: mercurial-4.3.1/mercurial/hgweb/server.py
+Index: mercurial-4.4.1/mercurial/hgweb/server.py
===================================================================
---- mercurial-4.3.1.orig/mercurial/hgweb/server.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/mercurial/hgweb/server.py 2017-08-11 05:08:19.127244603 +0200
-@@ -228,7 +228,8 @@
+--- mercurial-4.4.1.orig/mercurial/hgweb/server.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/mercurial/hgweb/server.py 2017-11-13 07:04:57.790211691 +0200
+@@ -240,7 +240,8 @@
from .. import sslutil
sslutil.modernssl
except ImportError:
@@ -175,11 +175,11 @@
certfile = ui.config('web', 'certificate')
-Index: mercurial-4.3.1/mercurial/sslutil.py
+Index: mercurial-4.4.1/mercurial/sslutil.py
===================================================================
---- mercurial-4.3.1.orig/mercurial/sslutil.py 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/mercurial/sslutil.py 2017-08-11 05:08:19.127244603 +0200
-@@ -248,7 +248,9 @@
+--- mercurial-4.4.1.orig/mercurial/sslutil.py 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/mercurial/sslutil.py 2017-11-13 07:04:57.790211691 +0200
+@@ -247,7 +247,9 @@
cafile = util.expandpath(cafile)
if not os.path.exists(cafile):
raise error.Abort(_('could not find web.cacerts: %s') %
@@ -190,10 +190,10 @@
elif s['allowloaddefaultcerts']:
# CAs not defined in config. Try to find system bundles.
cafile = _defaultcacerts(ui)
-Index: mercurial-4.3.1/tests/test-https.t
+Index: mercurial-4.4.1/tests/test-https.t
===================================================================
---- mercurial-4.3.1.orig/tests/test-https.t 2017-08-11 05:08:19.131244669 +0200
-+++ mercurial-4.3.1/tests/test-https.t 2017-08-11 05:08:19.127244603 +0200
+--- mercurial-4.4.1.orig/tests/test-https.t 2017-11-13 07:04:57.794211761 +0200
++++ mercurial-4.4.1/tests/test-https.t 2017-11-13 07:04:57.790211691 +0200
@@ -29,7 +29,7 @@
$ hg in --config web.cacerts=no-such.pem https://localhost:$HGPORT/
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,9 +1,9 @@
Use sensible-editor as default instead of vi.
-Index: mercurial-4.3.1/hgeditor
+Index: mercurial-4.4.1/hgeditor
===================================================================
---- mercurial-4.3.1.orig/hgeditor 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/hgeditor 2017-08-11 05:03:26.398393624 +0200
+--- mercurial-4.4.1.orig/hgeditor 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/hgeditor 2017-11-13 07:03:25.708617065 +0200
@@ -7,7 +7,7 @@
# only for Mercurial, modify this:
case "${EDITOR}" in
@@ -13,11 +13,11 @@
;;
emacs)
EDITOR="$EDITOR -nw"
-Index: mercurial-4.3.1/mercurial/ui.py
+Index: mercurial-4.4.1/mercurial/ui.py
===================================================================
---- mercurial-4.3.1.orig/mercurial/ui.py 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/mercurial/ui.py 2017-08-11 05:06:00.064939648 +0200
-@@ -1463,7 +1463,7 @@
+--- mercurial-4.4.1.orig/mercurial/ui.py 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/mercurial/ui.py 2017-11-13 07:03:25.708617065 +0200
+@@ -1512,7 +1512,7 @@
# avoid confusion.
editor = 'E'
else:
@@ -26,10 +26,10 @@
return (encoding.environ.get("HGEDITOR") or
self.config("ui", "editor", editor))
-Index: mercurial-4.3.1/i18n/da.po
+Index: mercurial-4.4.1/i18n/da.po
===================================================================
---- mercurial-4.3.1.orig/i18n/da.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/da.po 2017-08-11 05:03:26.402393690 +0200
+--- mercurial-4.4.1.orig/i18n/da.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/da.po 2017-11-13 07:03:25.708617065 +0200
@@ -8752,7 +8752,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -58,10 +58,10 @@
msgstr ""
msgid ""
-Index: mercurial-4.3.1/i18n/de.po
+Index: mercurial-4.4.1/i18n/de.po
===================================================================
---- mercurial-4.3.1.orig/i18n/de.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/de.po 2017-08-11 05:03:26.406393756 +0200
+--- mercurial-4.4.1.orig/i18n/de.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/de.po 2017-11-13 07:03:25.712617135 +0200
@@ -11683,8 +11683,8 @@
msgid "checking commit editor...\n"
msgstr "Prüfe Editor für Versionsmeldungen...\n"
@@ -101,10 +101,10 @@
msgid ""
"PYTHONPATH\n"
-Index: mercurial-4.3.1/i18n/el.po
+Index: mercurial-4.4.1/i18n/el.po
===================================================================
---- mercurial-4.3.1.orig/i18n/el.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/el.po 2017-08-11 05:03:26.406393756 +0200
+--- mercurial-4.4.1.orig/i18n/el.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/el.po 2017-11-13 07:03:25.712617135 +0200
@@ -274,7 +274,7 @@
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
@@ -123,10 +123,10 @@
msgstr ""
msgid " (specify a commit editor in your .hgrc file)\n"
-Index: mercurial-4.3.1/i18n/fr.po
+Index: mercurial-4.4.1/i18n/fr.po
===================================================================
---- mercurial-4.3.1.orig/i18n/fr.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/fr.po 2017-08-11 05:03:26.406393756 +0200
+--- mercurial-4.4.1.orig/i18n/fr.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/fr.po 2017-11-13 07:03:25.712617135 +0200
@@ -299,7 +299,7 @@
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
@@ -145,10 +145,10 @@
msgstr ""
msgid " (specify a commit editor in your .hgrc file)\n"
-Index: mercurial-4.3.1/i18n/it.po
+Index: mercurial-4.4.1/i18n/it.po
===================================================================
---- mercurial-4.3.1.orig/i18n/it.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/it.po 2017-08-11 05:03:26.406393756 +0200
+--- mercurial-4.4.1.orig/i18n/it.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/it.po 2017-11-13 07:03:25.716617204 +0200
@@ -7156,8 +7156,8 @@
msgid "Checking commit editor...\n"
msgstr "Sto controllando l'editor per il commit...\n"
@@ -169,10 +169,10 @@
msgstr ""
msgid ""
-Index: mercurial-4.3.1/i18n/ja.po
+Index: mercurial-4.4.1/i18n/ja.po
===================================================================
---- mercurial-4.3.1.orig/i18n/ja.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/ja.po 2017-08-11 05:03:26.410393822 +0200
+--- mercurial-4.4.1.orig/i18n/ja.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/ja.po 2017-11-13 07:03:25.720617274 +0200
@@ -23224,10 +23224,12 @@
msgid ""
@@ -206,11 +206,11 @@
msgid ""
"PYTHONPATH\n"
-Index: mercurial-4.3.1/i18n/pt_BR.po
+Index: mercurial-4.4.1/i18n/pt_BR.po
===================================================================
---- mercurial-4.3.1.orig/i18n/pt_BR.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/pt_BR.po 2017-08-11 05:03:26.414393889 +0200
-@@ -23986,11 +23986,12 @@
+--- mercurial-4.4.1.orig/i18n/pt_BR.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/pt_BR.po 2017-11-13 07:03:25.720617274 +0200
+@@ -26089,11 +26089,12 @@
msgid ""
"``editor``\n"
@@ -225,7 +225,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -25536,7 +25537,7 @@
+@@ -27663,7 +27664,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"
@@ -234,7 +234,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -25544,7 +25545,7 @@
+@@ -27671,7 +27672,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"
@@ -243,7 +243,7 @@
msgid ""
"PYTHONPATH\n"
-@@ -36726,10 +36727,10 @@
+@@ -39019,10 +39020,10 @@
#~ msgid " (check that you compiled the extensions)\n"
#~ msgstr " (verifique se você compilou as extensões)\n"
@@ -256,10 +256,10 @@
#~ msgid " Can't find editor '%s' in PATH\n"
#~ msgstr " Não é possÃvel localizar editor '%s' no PATH\n"
-Index: mercurial-4.3.1/i18n/sv.po
+Index: mercurial-4.4.1/i18n/sv.po
===================================================================
---- mercurial-4.3.1.orig/i18n/sv.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/sv.po 2017-08-11 05:03:26.414393889 +0200
+--- mercurial-4.4.1.orig/i18n/sv.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/sv.po 2017-11-13 07:03:25.724617343 +0200
@@ -9509,8 +9509,8 @@
msgid "checking commit editor...\n"
msgstr "kontrollerar arkiveringseditor...\n"
@@ -290,10 +290,10 @@
msgstr ""
msgid ""
-Index: mercurial-4.3.1/i18n/zh_CN.po
+Index: mercurial-4.4.1/i18n/zh_CN.po
===================================================================
---- mercurial-4.3.1.orig/i18n/zh_CN.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/zh_CN.po 2017-08-11 05:03:26.414393889 +0200
+--- mercurial-4.4.1.orig/i18n/zh_CN.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/zh_CN.po 2017-11-13 07:03:25.724617343 +0200
@@ -5778,7 +5778,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -312,10 +312,10 @@
msgstr ""
msgid ""
-Index: mercurial-4.3.1/i18n/zh_TW.po
+Index: mercurial-4.4.1/i18n/zh_TW.po
===================================================================
---- mercurial-4.3.1.orig/i18n/zh_TW.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/zh_TW.po 2017-08-11 05:03:26.418393955 +0200
+--- mercurial-4.4.1.orig/i18n/zh_TW.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/zh_TW.po 2017-11-13 07:03:25.724617343 +0200
@@ -6759,8 +6759,8 @@
msgid "Checking commit editor...\n"
msgstr "檢查æ交訊æ¯ç·¨è¼¯å™¨...\n"
@@ -336,10 +336,10 @@
msgstr ""
msgid ""
-Index: mercurial-4.3.1/mercurial/help/environment.txt
+Index: mercurial-4.4.1/mercurial/help/environment.txt
===================================================================
---- mercurial-4.3.1.orig/mercurial/help/environment.txt 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/mercurial/help/environment.txt 2017-08-11 05:03:26.418393955 +0200
+--- mercurial-4.4.1.orig/mercurial/help/environment.txt 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/mercurial/help/environment.txt 2017-11-13 07:03:25.724617343 +0200
@@ -104,7 +104,7 @@
editor it uses is determined by looking at the environment
variables HGEDITOR, VISUAL and EDITOR, in that order. The first
@@ -349,11 +349,11 @@
PYTHONPATH
This is used by Python to find imported modules and may need to be
-Index: mercurial-4.3.1/mercurial/help/config.txt
+Index: mercurial-4.4.1/mercurial/help/config.txt
===================================================================
---- mercurial-4.3.1.orig/mercurial/help/config.txt 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/mercurial/help/config.txt 2017-08-11 05:03:26.418393955 +0200
-@@ -1941,7 +1941,8 @@
+--- mercurial-4.4.1.orig/mercurial/help/config.txt 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/mercurial/help/config.txt 2017-11-13 07:03:25.724617343 +0200
+@@ -2051,7 +2051,8 @@
Print debugging information. (default: False)
``editor``
@@ -363,10 +363,10 @@
``fallbackencoding``
Encoding to try if it's not possible to decode the changelog using
-Index: mercurial-4.3.1/i18n/ro.po
+Index: mercurial-4.4.1/i18n/ro.po
===================================================================
---- mercurial-4.3.1.orig/i18n/ro.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/ro.po 2017-08-11 05:03:26.418393955 +0200
+--- mercurial-4.4.1.orig/i18n/ro.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/ro.po 2017-11-13 07:03:25.724617343 +0200
@@ -7722,7 +7722,7 @@
msgid "Checking commit editor...\n"
msgstr "Se verifică editorul pentru commit...\n"
@@ -395,10 +395,10 @@
msgstr ""
msgid ""
-Index: mercurial-4.3.1/i18n/ru.po
+Index: mercurial-4.4.1/i18n/ru.po
===================================================================
---- mercurial-4.3.1.orig/i18n/ru.po 2017-08-11 05:03:26.426394088 +0200
-+++ mercurial-4.3.1/i18n/ru.po 2017-08-11 05:03:26.422394021 +0200
+--- mercurial-4.4.1.orig/i18n/ru.po 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/i18n/ru.po 2017-11-13 07:03:25.728617412 +0200
@@ -12451,8 +12451,8 @@
msgid "checking commit editor...\n"
msgstr "проверка редактора Ñообщений фикÑации...\n"
@@ -442,11 +442,11 @@
msgid ""
"PYTHONPATH\n"
-Index: mercurial-4.3.1/mercurial/debugcommands.py
+Index: mercurial-4.4.1/mercurial/debugcommands.py
===================================================================
---- mercurial-4.3.1.orig/mercurial/debugcommands.py 2017-08-11 05:07:24.122332797 +0200
-+++ mercurial-4.3.1/mercurial/debugcommands.py 2017-08-11 05:07:00.917948181 +0200
-@@ -1099,15 +1099,15 @@
+--- mercurial-4.4.1.orig/mercurial/debugcommands.py 2017-11-13 07:03:25.728617412 +0200
++++ mercurial-4.4.1/mercurial/debugcommands.py 2017-11-13 07:03:25.728617412 +0200
+@@ -1098,15 +1098,15 @@
editor = util.expandpath(editor)
fm.write('editor', _("checking commit editor... (%s)\n"), editor)
cmdpath = util.findexe(pycompat.shlexsplit(editor)[0])
Modified: packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -7,11 +7,11 @@
This fixes it at least in Debian. I'm unsure about other systems.
Bug: http://bz.selenic.com/show_bug.cgi?id=4045
-Index: mercurial-4.3.1/tests/run-tests.py
+Index: mercurial-4.4.1/tests/run-tests.py
===================================================================
---- mercurial-4.3.1.orig/tests/run-tests.py 2017-08-11 05:08:33.659485523 +0200
-+++ mercurial-4.3.1/tests/run-tests.py 2017-08-11 05:08:33.655485456 +0200
-@@ -2576,7 +2576,7 @@
+--- mercurial-4.4.1.orig/tests/run-tests.py 2017-11-13 07:05:07.614381768 +0200
++++ mercurial-4.4.1/tests/run-tests.py 2017-11-13 07:05:07.610381699 +0200
+@@ -2670,7 +2670,7 @@
sys.executable)
mypython = os.path.join(self._tmpbindir, pyexename)
try:
Deleted: packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,19 +0,0 @@
-Index: mercurial-4.3.1/tests/test-context.py
-===================================================================
---- mercurial-4.3.1.orig/tests/test-context.py 2017-08-11 00:46:53.000000000 +0200
-+++ mercurial-4.3.1/tests/test-context.py 2017-08-12 11:13:01.089138397 +0200
-@@ -24,11 +24,10 @@
- repo[None].add(['foo'])
- repo.commit(text='commit1', date="0 0")
-
-+d = repo[None]['foo'].date()
- if os.name == 'nt':
-- d = repo[None]['foo'].date()
-- print("workingfilectx.date = (%d, %d)" % (d[0], d[1]))
--else:
-- print("workingfilectx.date =", repo[None]['foo'].date())
-+ d = d[:2]
-+print("workingfilectx.date = (%d, %d)" % d)
-
- # test memctx with non-ASCII commit message
-
Deleted: packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,26 +0,0 @@
-Index: mercurial-4.3.1/tests/test-acl.t
-===================================================================
---- mercurial-4.3.1.orig/tests/test-acl.t 2017-08-11 00:46:53.000000000 +0200
-+++ mercurial-4.3.1/tests/test-acl.t 2017-08-12 10:28:19.003812499 +0200
-@@ -883,7 +883,7 @@
- added 3 changesets with 3 changes to 3 files
- calling hook pretxnchangegroup.acl: hgext.acl.hook
- acl: checking access for user "barney"
-- error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config'
-+ error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob)
- bundle2-input-part: total payload size 1553
- bundle2-input-bundle: 3 parts total
- transaction abort!
-Index: mercurial-4.3.1/tests/test-tags.t
-===================================================================
---- mercurial-4.3.1.orig/tests/test-tags.t 2017-08-11 00:46:53.000000000 +0200
-+++ mercurial-4.3.1/tests/test-tags.t 2017-08-12 10:28:36.104105534 +0200
-@@ -381,7 +381,7 @@
-
- $ hg blackbox -l 6
- 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags
-- 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> couldn't write cache/hgtagsfnodes1: [Errno 13] Permission denied: '$TESTTMP/t2/.hg/cache/hgtagsfnodes1'
-+ 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> couldn't write cache/hgtagsfnodes1: [Errno *] * (glob)
- 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 2/3 cache hits/lookups in * seconds (glob)
- 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
- 1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)
Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2017-11-13 05:07:37 UTC (rev 14467)
@@ -1,9 +1,9 @@
Correct the documentation for the zeroconf extension.
-Index: mercurial-4.3.1/hgext/zeroconf/__init__.py
+Index: mercurial-4.4.1/hgext/zeroconf/__init__.py
===================================================================
---- mercurial-4.3.1.orig/hgext/zeroconf/__init__.py 2017-08-11 05:08:26.583368212 +0200
-+++ mercurial-4.3.1/hgext/zeroconf/__init__.py 2017-08-11 05:08:26.579368145 +0200
+--- mercurial-4.4.1.orig/hgext/zeroconf/__init__.py 2017-11-13 07:05:02.206288143 +0200
++++ mercurial-4.4.1/hgext/zeroconf/__init__.py 2017-11-13 07:05:02.202288075 +0200
@@ -6,9 +6,9 @@
# GNU General Public License version 2 or any later version.
'''discover and advertise repositories on the local network
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2017-11-13 04:19:48 UTC (rev 14466)
+++ packages/mercurial/trunk/debian/patches/series 2017-11-13 05:07:37 UTC (rev 14467)
@@ -5,5 +5,3 @@
deb_specific__disable_libdir_replacement.patch
for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
deb_specific__fix_fhs_paths.patch
-for_upstream__unhardcode_errno.patch
-for_upstream__normalize_ints.patch
More information about the Python-apps-commits
mailing list