[Python-apps-commits] r10775 - in packages/mercurial/trunk/debian/patches (7 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sat Apr 19 11:15:14 UTC 2014
Date: Saturday, April 19, 2014 @ 11:15:13
Author: vicho
Revision: 10775
Refresh patches
Modified:
packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch
packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
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/for_upstream__lenient_test-shelve.patch
Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2014-04-19 11:15:13 UTC (rev 10775)
@@ -12,7 +12,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -413,7 +413,6 @@ cmdclass = {'build': hgbuild,
+@@ -420,7 +420,6 @@ cmdclass = {'build': hgbuild,
'build_ext': hgbuildext,
'build_py': hgbuildpy,
'build_hgextindex': buildhgextindex,
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2014-04-19 11:15:13 UTC (rev 10775)
@@ -116,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -237,16 +238,19 @@ class svn_source(converter_source):
+@@ -278,16 +279,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 = {}
-@@ -1025,6 +1029,8 @@ class svn_sink(converter_sink, commandli
+@@ -1069,6 +1073,8 @@ class svn_sink(converter_sink, commandli
return self.join('hg-authormap')
def __init__(self, ui, path):
Modified: packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_help_in_fhs.patch 2014-04-19 11:15:13 UTC (rev 10775)
@@ -4,7 +4,7 @@
--- a/mercurial/help.py
+++ b/mercurial/help.py
-@@ -132,9 +132,11 @@ def loaddoc(topic):
+@@ -133,9 +133,11 @@ def loaddoc(topic):
module = __file__
base = os.path.dirname(module)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/deb_specific__support_templates_in_fsh.patch 2014-04-19 11:15:13 UTC (rev 10775)
@@ -4,7 +4,7 @@
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
-@@ -375,7 +375,7 @@ funcs = {
+@@ -494,7 +494,7 @@ funcs = {
# template engine
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2014-04-19 11:15:13 UTC (rev 10775)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -2121,8 +2121,8 @@ def debuginstall(ui):
+@@ -2211,8 +2211,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
-@@ -767,7 +767,7 @@ class ui(object):
+@@ -786,7 +786,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
@@ -67,7 +67,7 @@
msgid ""
--- a/i18n/de.po
+++ b/i18n/de.po
-@@ -11680,8 +11680,8 @@ msgstr " (Vorlagen scheinen falsch insta
+@@ -11683,8 +11683,8 @@ msgstr " (Vorlagen scheinen falsch insta
msgid "checking commit editor...\n"
msgstr "Prüfe Editor für Versionsmeldungen...\n"
@@ -78,7 +78,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -17233,7 +17233,8 @@ msgstr ""
+@@ -17242,7 +17242,8 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -88,7 +88,7 @@
msgstr ""
msgid ""
-@@ -18111,7 +18112,7 @@ msgid ""
+@@ -18120,7 +18121,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"
@@ -97,7 +97,7 @@
msgstr ""
"EDITOR\n"
" Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -18120,7 +18121,7 @@ msgstr ""
+@@ -18129,7 +18130,7 @@ msgstr ""
" variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
"ermittelt.\n"
" Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\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
-@@ -1166,7 +1166,8 @@ User interface controls.
+@@ -1178,7 +1178,8 @@ User interface controls.
Print debugging information. True or False. Default is 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 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2014-04-19 11:15:13 UTC (rev 10775)
@@ -9,9 +9,9 @@
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
-@@ -436,7 +436,7 @@ def usecorrectpython():
+@@ -440,7 +440,7 @@ def usecorrectpython():
sys.executable)
- mypython = os.path.join(BINDIR, pyexename)
+ mypython = os.path.join(TMPBINDIR, pyexename)
try:
- if os.readlink(mypython) == sys.executable:
+ if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
Modified: packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch 2014-04-19 11:00:55 UTC (rev 10774)
+++ packages/mercurial/trunk/debian/patches/for_upstream__lenient_test-shelve.patch 2014-04-19 11:15:13 UTC (rev 10775)
@@ -5,24 +5,20 @@
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 @@
-
+--- a/tests/test-shelve.t
++++ b/tests/test-shelve.t
+@@ -77,11 +77,11 @@ the common case - no options or filename
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
+- 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 (*) [mq]: second.patch (glob)
-+ default (*)* [mq]: second.patch (glob)
+- 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
More information about the Python-apps-commits
mailing list