[Python-apps-commits] r13147 - in packages/mercurial/trunk/debian/patches (6 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Mon May 2 15:03:22 UTC 2016
Date: Monday, May 2, 2016 @ 15:03:21
Author: vicho
Revision: 13147
Refresh patches
Modified:
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__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
Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2016-05-02 15:03:04 UTC (rev 13146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2016-05-02 15:03:21 UTC (rev 13147)
@@ -11,7 +11,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -531,7 +531,6 @@ cmdclass = {'build': hgbuild,
+@@ -526,7 +526,6 @@ cmdclass = {'build': hgbuild,
'build_scripts': hgbuildscripts,
'build_hgextindex': buildhgextindex,
'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 2016-05-02 15:03:04 UTC (rev 13146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__fix_fhs_paths.patch 2016-05-02 15:03:21 UTC (rev 13147)
@@ -9,7 +9,7 @@
--- a/mercurial/util.py
+++ b/mercurial/util.py
-@@ -886,6 +886,8 @@ def mainfrozen():
+@@ -900,6 +900,8 @@ def mainfrozen():
if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(sys.executable)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2016-05-02 15:03:04 UTC (rev 13146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2016-05-02 15:03:21 UTC (rev 13147)
@@ -2,7 +2,7 @@
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
-@@ -358,7 +358,8 @@ class bzmysql(bzaccess):
+@@ -369,7 +369,8 @@ class bzmysql(bzaccess):
import MySQLdb as mysql
bzmysql._MySQLdb = mysql
except ImportError as err:
@@ -14,19 +14,19 @@
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
-@@ -44,7 +44,8 @@ class bzr_source(converter_source):
+@@ -53,7 +53,8 @@ class bzr_source(common.converter_source
# access bzrlib stuff
bzrdir
except NameError:
-- raise NoRepo(_('Bazaar modules could not be loaded'))
-+ raise NoRepo(_('Bazaar modules could not be loaded') +
+- raise common.NoRepo(_('Bazaar modules could not be loaded'))
++ raise common.NoRepo(_('Bazaar modules could not be loaded') +
+ _(' (try installing the %s package)') % 'bzr')
path = os.path.abspath(path)
self._checkrepotype(path)
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
-@@ -28,14 +28,15 @@ def decodeargs(s):
+@@ -39,14 +39,15 @@ def decodeargs(s):
class MissingTool(Exception):
pass
@@ -46,7 +46,7 @@
pass
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
-@@ -22,7 +22,7 @@ class convert_cvs(converter_source):
+@@ -38,7 +38,7 @@ class convert_cvs(converter_source):
if not os.path.exists(cvs):
raise NoRepo(_("%s does not look like a CVS checkout") % path)
@@ -57,12 +57,12 @@
self.files = {}
--- a/hgext/convert/darcs.py
+++ b/hgext/convert/darcs.py
-@@ -36,14 +36,15 @@ class darcs_source(converter_source, com
+@@ -49,14 +49,15 @@ class darcs_source(common.converter_sour
if not os.path.exists(os.path.join(path, '_darcs')):
raise NoRepo(_("%s does not look like a darcs repository") % path)
-- checktool('darcs')
-+ checktool('darcs', debname='darcs')
+- common.checktool('darcs')
++ common.checktool('darcs', debname='darcs')
version = self.run0('--version').splitlines()[0].strip()
if version < '2.1':
raise error.Abort(_('darcs version 2.1 or newer needed (found %r)')
@@ -77,18 +77,18 @@
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
-@@ -75,7 +75,7 @@ class convert_git(converter_source, comm
+@@ -80,7 +80,7 @@ class convert_git(common.converter_sourc
else:
self.simopt = []
-- checktool('git', 'git')
-+ checktool('git', 'git', debname='git-core')
+- common.checktool('git', 'git')
++ common.checktool('git', 'git', debname="git-core")
self.path = path
self.submodules = []
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
-@@ -42,7 +42,8 @@ class gnuarch_source(converter_source, c
+@@ -50,7 +50,8 @@ class gnuarch_source(common.converter_so
if util.findexe('tla'):
self.execmd = 'tla'
else:
@@ -96,30 +96,22 @@
+ raise error.Abort(_('cannot find a GNU Arch tool') +
+ _(' (try installing the %s package)') % 'tla')
- commandline.__init__(self, ui, self.execmd)
+ common.commandline.__init__(self, ui, self.execmd)
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
-@@ -69,7 +69,7 @@ class monotone_source(converter_source,
+@@ -75,7 +75,7 @@ class monotone_source(common.converter_s
self.files = None
self.dirs = None
-- checktool('mtn', abort=False)
-+ checktool('mtn', abort=False, debname='monotone')
+- common.checktool('mtn', abort=False)
++ common.checktool('mtn', abort=False, debname='monotone')
def mtnrun(self, *args, **kwargs):
if self.automatestdio:
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
-@@ -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
-+from common import checktool
-
- try:
- from svn.core import SubversionException, Pool
-@@ -278,16 +279,19 @@ class svn_source(converter_source):
+@@ -298,16 +298,19 @@ class svn_source(converter_source):
raise NoRepo(_("%s does not look like a Subversion repository")
% url)
if svn is None:
@@ -142,18 +134,18 @@
self.lastrevs = {}
-@@ -1094,6 +1098,8 @@ class svn_sink(converter_sink, commandli
+@@ -1114,6 +1117,8 @@ class svn_sink(converter_sink, commandli
return self.join('hg-authormap')
def __init__(self, ui, path):
-+ checktool('svn', debname='subversion')
-+ checktool('svnadmin', debname='subversion')
++ common.checktool('svn', debname='subversion')
++ common.checktool('svnadmin', debname='subversion')
converter_sink.__init__(self, ui, path)
commandline.__init__(self, ui, 'svn')
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
-@@ -225,7 +225,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -227,7 +227,8 @@ class _httprequesthandlerssl(_httpreques
import ssl
ssl.wrap_socket
except ImportError:
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2016-05-02 15:03:04 UTC (rev 13146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2016-05-02 15:03:21 UTC (rev 13147)
@@ -13,20 +13,29 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -2724,8 +2724,8 @@ def debuginstall(ui):
+@@ -2792,15 +2792,15 @@ def debuginstall(ui, **opts):
editor = util.expandpath(editor)
+ fm.write('editor', _("checking commit editor... (%s)\n"), editor)
cmdpath = util.findexe(shlex.split(editor)[0])
- if not cmdpath:
-- if editor == 'vi':
-- ui.write(_(" No commit editor set and can't find vi in PATH\n"))
-+ if editor == 'sensible-editor':
-+ ui.write(_(" No commit editor set and can't find sensible-editor in PATH\n"))
- ui.write(_(" (specify a commit editor in your configuration"
- " file)\n"))
- else:
+- fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
++ fm.condwrite(not cmdpath and editor == 'sensible-editor', 'vinotfound',
+ _(" No commit editor set and can't find %s in PATH\n"
+ " (specify a commit editor in your configuration"
+- " file)\n"), not cmdpath and editor == 'vi' and editor)
+- fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
++ " file)\n"), not cmdpath and editor == 'sensible-editor' and editor)
++ fm.condwrite(not cmdpath and editor != 'sensible-editor', 'editornotfound',
+ _(" Can't find editor '%s' in PATH\n"
+ " (specify a commit editor in your configuration"
+ " file)\n"), not cmdpath and editor)
+- if not cmdpath and editor != 'vi':
++ if not cmdpath and editor != 'sensible-editor':
+ problems += 1
+
+ # check username
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -981,7 +981,7 @@ class ui(object):
+@@ -1056,7 +1056,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
@@ -216,21 +225,8 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -13805,10 +13805,10 @@ msgstr " (modelos parecem ter sido insta
- msgid "checking commit editor...\n"
- msgstr "verificando editor para consolidação...\n"
+@@ -22953,11 +22953,12 @@ msgstr ""
--msgid " No commit editor set and can't find vi in PATH\n"
-+msgid " No commit editor set and can't find sensible-editor in PATH\n"
- msgstr ""
- " Nenhum editor para consolidação configurado, e não foi possÃvel encontrar "
--"'vi' no PATH\n"
-+"'sensible-editor' no PATH\n"
-
- msgid " (specify a commit editor in your configuration file)\n"
- msgstr ""
-@@ -22398,11 +22398,12 @@ msgstr ""
-
msgid ""
"``editor``\n"
-" The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)"
@@ -244,7 +240,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -23867,7 +23868,7 @@ msgid ""
+@@ -24437,7 +24438,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 +249,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -23875,7 +23876,7 @@ msgstr ""
+@@ -24445,7 +24446,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"
@@ -262,6 +258,19 @@
msgid ""
"PYTHONPATH\n"
+@@ -33039,10 +33040,10 @@ msgstr "o número de cpus deve ser um in
+ #~ msgid " (check that you compiled the extensions)\n"
+ #~ msgstr " (verifique se você compilou as extensões)\n"
+
+-#~ msgid " No commit editor set and can't find vi in PATH\n"
++#~ msgid " No commit editor set and can't find sensible-editor in PATH\n"
+ #~ msgstr ""
+ #~ " Nenhum editor para consolidação configurado, e não foi possÃvel encontrar "
+-#~ "'vi' no PATH\n"
++#~ "'sensible-editor' no PATH\n"
+
+ #~ msgid " Can't find editor '%s' in PATH\n"
+ #~ msgstr " Não é possÃvel localizar editor '%s' no PATH\n"
--- a/i18n/sv.po
+++ b/i18n/sv.po
@@ -9509,8 +9509,8 @@ msgstr " (mallar verkar vara inkorrekt i
@@ -338,7 +347,7 @@
msgid ""
--- a/mercurial/help/environment.txt
+++ b/mercurial/help/environment.txt
-@@ -100,7 +100,7 @@ EDITOR
+@@ -104,7 +104,7 @@ EDITOR
editor it uses is determined by looking at the environment
variables HGEDITOR, VISUAL and EDITOR, in that order. The first
non-empty one is chosen. If all of them are empty, the editor
@@ -349,7 +358,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
-@@ -1567,7 +1567,8 @@ User interface controls.
+@@ -1594,7 +1594,8 @@ User interface controls.
Print debugging information. (default: False)
``editor``
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 2016-05-02 15:03:04 UTC (rev 13146)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2016-05-02 15:03:21 UTC (rev 13147)
@@ -9,7 +9,7 @@
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
-@@ -2143,7 +2143,7 @@ class TestRunner(object):
+@@ -2286,7 +2286,7 @@ class TestRunner(object):
sys.executable)
mypython = os.path.join(self._tmpbindir, pyexename)
try:
Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2016-05-02 15:03:04 UTC (rev 13146)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2016-05-02 15:03:21 UTC (rev 13147)
@@ -2,8 +2,8 @@
--- a/hgext/zeroconf/__init__.py
+++ b/hgext/zeroconf/__init__.py
-@@ -7,9 +7,9 @@
-
+@@ -6,9 +6,9 @@
+ # GNU General Public License version 2 or any later version.
'''discover and advertise repositories on the local network
-Zeroconf-enabled repositories will be announced in a network without
More information about the Python-apps-commits
mailing list