[Python-apps-commits] r4147 - in packages/mercurial/trunk/debian/patches (7 files)
vdanjean at users.alioth.debian.org
vdanjean at users.alioth.debian.org
Thu Nov 19 19:44:50 UTC 2009
Date: Thursday, November 19, 2009 @ 19:44:49
Author: vdanjean
Revision: 4147
Update debian patches against mercurial 1.4
update deb_specific__use_sensible-editor.patch by patching all available translations
Modified:
packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
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__force_C_locale.patch
packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
Modified: packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__hgk.py.patch 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,6 +1,5 @@
Set default hgk path for hgk outside bin.
-diff -r 5d6bd2f5ea7e hgext/hgk.py
--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -307,7 +307,7 @@
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,6 +1,5 @@
Support installation of templates handled by mercurial-common.install.
-diff -r 2cbbf40418af mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -9,7 +9,7 @@
@@ -12,10 +11,9 @@
stringify = templatefilters.stringify
def parsestring(s, quoted=True):
-diff -r 2cbbf40418af setup.py
--- a/setup.py
+++ b/setup.py
-@@ -254,7 +254,7 @@
+@@ -256,7 +256,7 @@
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
datafiles = []
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,6 +1,5 @@
Suggest Debian packages for some optional dependencies.
-diff -r d29c8b10d01f hgext/bugzilla.py
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
@@ -421,7 +421,8 @@
@@ -13,7 +12,6 @@
if node is None:
raise util.Abort(_('hook type %s does not pass a changeset id') %
-diff -r d29c8b10d01f hgext/convert/bzr.py
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -42,7 +42,8 @@
@@ -26,7 +24,6 @@
path = os.path.abspath(path)
self._checkrepotype(path)
-diff -r d29c8b10d01f hgext/convert/common.py
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
@@ -26,11 +26,12 @@
@@ -44,7 +41,6 @@
class NoRepo(Exception): pass
-diff -r d29c8b10d01f hgext/convert/cvs.py
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
@@ -21,7 +21,7 @@
@@ -56,7 +52,6 @@
self.changeset = None
self.files = {}
-diff -r d29c8b10d01f hgext/convert/darcs.py
--- a/hgext/convert/darcs.py
+++ b/hgext/convert/darcs.py
@@ -35,14 +35,15 @@
@@ -77,7 +72,6 @@
self.path = os.path.realpath(path)
-diff -r d29c8b10d01f hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -37,7 +37,7 @@
@@ -89,7 +83,6 @@
self.path = path
-diff -r d29c8b10d01f hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
@@ -41,7 +41,8 @@
@@ -102,7 +95,6 @@
commandline.__init__(self, ui, self.execmd)
-diff -r d29c8b10d01f hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -55,7 +55,7 @@
@@ -114,10 +106,9 @@
# test if there are any revisions
self.rev = None
-diff -r d29c8b10d01f hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
from common import commandline, converter_source, converter_sink, mapfile
@@ -125,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -197,16 +198,19 @@
+@@ -212,16 +213,19 @@
try:
SubversionException
except NameError:
@@ -148,7 +139,7 @@
self.lastrevs = {}
-@@ -937,6 +941,9 @@
+@@ -952,6 +956,9 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
@@ -158,7 +149,6 @@
converter_sink.__init__(self, ui, path)
commandline.__init__(self, ui, 'svn')
self.delete = []
-diff -r d29c8b10d01f mercurial/hgweb/server.py
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
@@ -260,7 +260,8 @@
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,9 +1,8 @@
Use sensible-editor as default instead of vi.
-diff -r 88b335331ee3 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
-@@ -745,7 +745,8 @@
+@@ -745,7 +745,7 @@
``debug``
Print debugging information. True or False. Default is False.
``editor``
@@ -13,7 +12,6 @@
``fallbackencoding``
Encoding to try if it's not possible to decode the changelog using
UTF-8. Default is ISO-8859-1.
-diff -r 88b335331ee3 doc/ja/hg.1.ja.txt
--- a/doc/ja/hg.1.ja.txt
+++ b/doc/ja/hg.1.ja.txt
@@ -813,7 +813,7 @@
@@ -25,7 +23,6 @@
PYTHONPATH::
ããã¯ã¤ã³ãã¼ããããã¢ã¸ã¥ã¼ã«ãè¦ã¤ããããã« Python ã«ãã£
-diff -r 88b335331ee3 doc/ja/hgrc.5.ja.txt
--- a/doc/ja/hgrc.5.ja.txt
+++ b/doc/ja/hgrc.5.ja.txt
@@ -119,7 +119,7 @@
@@ -37,19 +34,6 @@
interactive;;
ã¦ã¼ã¶ã«å¯¾ãã¦ããã³ãããåºãããã«ãã¾ããTrue ã False ãå
ãã¾ããããã©ã«ãã§ã¯ True ã§ãã
-diff -r 88b335331ee3 help/environment.txt
---- a/help/environment.txt
-+++ b/help/environment.txt
-@@ -69,7 +69,7 @@
- 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
-- defaults to 'vi'.
-+ defaults to 'sensible-editor'.
-
- PYTHONPATH
- This is used by Python to find imported modules and may need to be
-diff -r 88b335331ee3 hgeditor
--- a/hgeditor
+++ b/hgeditor
@@ -7,7 +7,7 @@
@@ -61,7 +45,6 @@
;;
emacs)
EDITOR="$EDITOR -nw"
-diff -r 88b335331ee3 mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1019,8 +1019,8 @@
@@ -75,10 +58,9 @@
ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
else:
ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
-diff -r 88b335331ee3 mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -350,7 +350,7 @@
+@@ -353,7 +353,7 @@
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
@@ -87,3 +69,242 @@
def progress(self, topic, pos, item="", unit="", total=None):
'''show a progress message
+--- a/help/environment.txt
++++ b/help/environment.txt
+@@ -69,7 +69,7 @@
+ 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
+- defaults to 'vi'.
++ defaults to 'sensible-editor'.
+
+ PYTHONPATH
+ This is used by Python to find imported modules and may need to be
+--- a/i18n/da.po
++++ b/i18n/da.po
+@@ -308,7 +308,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -6094,7 +6094,7 @@
+ msgid "Checking commit editor...\n"
+ 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 ""
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+--- a/i18n/de.po
++++ b/i18n/de.po
+@@ -314,7 +314,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -6749,8 +6749,8 @@
+ msgid "Checking commit editor...\n"
+ msgstr "Prüfe Editor für Versionsmeldungen...\n"
+
+-msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr " Kein Editor für Versionsmeldungen angegeben und vi nicht im PATH\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
++msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+ msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
+--- a/i18n/el.po
++++ b/i18n/el.po
+@@ -222,7 +222,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -5377,7 +5377,7 @@
+ msgid "Checking commit editor...\n"
+ 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 ""
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+--- a/i18n/fr.po
++++ b/i18n/fr.po
+@@ -260,7 +260,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -5803,7 +5803,7 @@
+ msgid "Checking commit editor...\n"
+ 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 ""
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+--- a/i18n/it.po
++++ b/i18n/it.po
+@@ -181,7 +181,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -5553,8 +5553,8 @@
+ msgid "Checking commit editor...\n"
+ msgstr "Sto controllando l'editor per il commit...\n"
+
+-msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr "Nessun editor per il commit trovato e non trovo vi in PATH\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
++msgstr "Nessun editor per il commit trovato e non trovo sensible-editor in PATH\n"
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+ msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n"
+--- a/i18n/ja.po
++++ b/i18n/ja.po
+@@ -415,7 +415,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -497,7 +497,7 @@
+ " ç·¨éãä¿ãç¶æ³ãããã¾ããããã§ä½¿ç¨ãããã¨ãã£ã¿ã¯ãHGEDITORãVISUAL\n"
+ " ããã㯠EDITOR ç°å¢å¤æ°ã«è¨å®ããããã®ã(ãã®é åºã§)使ç¨ãã¾ãã\n"
+ " æåã®ç©ºã§ç¡ãå¤ã«è¨å®ãããç°å¢å¤æ°ã®å¤ã使ç¨ãã¾ããããããæªè¨å®\n"
+-" (ãããã¯ç©º)ã®å ´åã¯ã'vi' ã使ç¨ããã¾ãã\n"
++" (ãããã¯ç©º)ã®å ´åã¯ã'sensible-editor' ã使ç¨ããã¾ãã\n"
+ "\n"
+ "PYTHONPATH\n"
+ " Mercurial ãå½è©²ã·ã¹ãã ã®å
±æé åã«ã¤ã³ã¹ãã¼ã«ããã¦ããªãå ´åã\n"
+@@ -6869,8 +6869,8 @@
+ msgid "Checking commit editor...\n"
+ msgstr "ã¡ãã»ã¼ã¸å
¥åç¨ã¨ãã£ã¿ã®æ¤è¨¼ä¸...\n"
+
+-msgid " No commit editor set and can't find vi in PATH\n"
+-msgstr " ã¨ãã£ã¿ãèµ·åã§ãã¾ãã(vi ã«ã PATH ãéã£ã¦ãã¾ãã)\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
++msgstr " ã¨ãã£ã¿ãèµ·åã§ãã¾ãã(sensible-editor ã«ã PATH ãéã£ã¦ãã¾ãã)\n"
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+ msgstr " (ã³ãããã¡ãã»ã¼ã¸ç¨ã¨ãã£ã¿ãè¨å®ãã¡ã¤ã«ã§è¨å®ãã¦ãã ãã)\n"
+--- a/i18n/pt_BR.po
++++ b/i18n/pt_BR.po
+@@ -358,7 +358,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -440,7 +440,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"
+-" estiverem vazios, o editor será o 'vi'.\n"
++" estiverem vazios, o editor será o 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " Isto é usado pelo Python para localizar módulos importados, e\n"
+@@ -7850,10 +7850,10 @@
+ msgid "Checking commit editor...\n"
+ msgstr "Verificando editor para consolidação...\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 " (specify a commit editor in your .hgrc file)\n"
+ msgstr " (especifique um editor para consolidação em seu arquivo .hgrc)\n"
+--- a/i18n/sv.po
++++ b/i18n/sv.po
+@@ -229,7 +229,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -5476,7 +5476,7 @@
+ msgid "Checking commit editor...\n"
+ 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 ""
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+--- a/i18n/zh_CN.po
++++ b/i18n/zh_CN.po
+@@ -5190,7 +5190,7 @@
+ msgid "Checking commit editor...\n"
+ 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 ""
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
+@@ -7565,7 +7565,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+--- a/i18n/zh_TW.po
++++ b/i18n/zh_TW.po
+@@ -182,7 +182,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"
+-" defaults to 'vi'.\n"
++" defaults to 'sensible-editor'.\n"
+ "\n"
+ "PYTHONPATH\n"
+ " This is used by Python to find imported modules and may need to be\n"
+@@ -5501,7 +5501,7 @@
+ msgid "Checking commit editor...\n"
+ 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 ""
+
+ msgid " (specify a commit editor in your .hgrc file)\n"
Modified: packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/for_upstream__force_C_locale.patch 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,6 +1,5 @@
Force C local when generating the documentation
-
-diff -r dec177286deb doc/Makefile
+Without the C locale, the generated file can already have translations in the current locale...
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -18,7 +18,7 @@
Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__correct-zeroconf-doc 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,6 +1,5 @@
Correct the documentation for the zeroconf extension.
-diff -r eeca030c4639 hgext/zeroconf/__init__.py
--- a/hgext/zeroconf/__init__.py
+++ b/hgext/zeroconf/__init__.py
@@ -7,9 +7,9 @@
Modified: packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n 2009-11-18 20:19:46 UTC (rev 4146)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n 2009-11-19 19:44:49 UTC (rev 4147)
@@ -1,10 +1,9 @@
Don't install the i18n folder; it's pointless to do so since the compiled
translations are in the locale folder.
-diff -r 1390cfdeffab setup.py
--- a/setup.py
+++ b/setup.py
-@@ -254,7 +254,7 @@
+@@ -256,7 +256,7 @@
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
datafiles = []
More information about the Python-apps-commits
mailing list