[Python-apps-commits] r5733 - in packages/mercurial/trunk/debian/patches (7 files)
vicho-guest at users.alioth.debian.org
vicho-guest at users.alioth.debian.org
Sat Jul 3 10:56:09 UTC 2010
Date: Saturday, July 3, 2010 @ 10:56:08
Author: vicho-guest
Revision: 5733
Refreshed patches.
Deleted a chunk in deb_specific__install-help-separately that has been
incorporated upstream.
Modified:
packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
packages/mercurial/trunk/debian/patches/deb_specific__mergetools
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__add_doc_url_in_example_files.patch
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2010-07-03 10:56:08 UTC (rev 5733)
@@ -1,25 +1,9 @@
Support installation of help topics handled by mercurial-common.install.
---- a/mercurial/help.py
-+++ b/mercurial/help.py
-@@ -73,9 +73,11 @@
- 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):
-+ path = os.path.join(base, dir, 'help')
-+ if os.path.isdir(path):
-+ docdir = path
- break
-
- path = os.path.join(docdir, topic + ".txt")
--- a/setup.py
+++ b/setup.py
-@@ -263,8 +263,7 @@
- ['hgext/inotify/linux/_inotify.c']))
+@@ -280,8 +280,7 @@
+ extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
-packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo',
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2010-07-03 10:56:08 UTC (rev 5733)
@@ -12,8 +12,8 @@
break
--- a/setup.py
+++ b/setup.py
-@@ -263,7 +263,7 @@
- ['hgext/inotify/linux/_inotify.c']))
+@@ -280,7 +280,7 @@
+ extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
-packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo']}
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2010-07-03 10:56:08 UTC (rev 5733)
@@ -3,17 +3,17 @@
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -9,7 +9,7 @@
- import re, sys, os
+ import sys, os
import util, config, templatefilters
-path = ['templates', '../templates']
+path = ['templates', '../templates', '/usr/share/mercurial/templates']
stringify = templatefilters.stringify
- def parsestring(s, quoted=True):
+ def _flatten(thing):
--- a/setup.py
+++ b/setup.py
-@@ -269,14 +269,6 @@
+@@ -286,14 +286,6 @@
def ordinarypath(p):
return p and p[0] != '.' and p[-1] != '~'
Modified: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools 2010-07-03 10:56:08 UTC (rev 5733)
@@ -2,7 +2,7 @@
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
-@@ -12,8 +12,11 @@
+@@ -13,6 +13,9 @@
gvimdiff.regname=path
gvimdiff.priority=-9
@@ -10,8 +10,5 @@
+vimdiff.priority=-10
+
merge.checkconflicts=True
--merge.priority=-10
-+merge.priority=-11
+ merge.priority=-100
- gpyfm.gui=True
-
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2010-07-03 10:56:08 UTC (rev 5733)
@@ -139,7 +139,7 @@
self.lastrevs = {}
-@@ -970,6 +974,9 @@
+@@ -953,6 +957,9 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
@@ -151,13 +151,13 @@
self.delete = []
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
-@@ -260,7 +260,8 @@
- from OpenSSL import SSL
- ctx = SSL.Context(SSL.SSLv23_METHOD)
- except ImportError:
-- raise util.Abort(_("SSL support is unavailable"))
-+ raise util.Abort(_("SSL support is unavailable") +
-+ _(" (try installing the %s package)") % 'python-openssl')
- ctx.use_privatekey_file(ssl_cert)
- ctx.use_certificate_file(ssl_cert)
- sock = socket.socket(self.address_family, self.socket_type)
+@@ -225,7 +225,8 @@
+ from OpenSSL import SSL
+ ctx = SSL.Context(SSL.SSLv23_METHOD)
+ except ImportError:
+- raise util.Abort(_("SSL support is unavailable"))
++ raise util.Abort(_("SSL support is unavailable") +
++ _(" (try installing the %s package)") % 'python-openssl')
+ ctx.use_privatekey_file(ssl_cert)
+ ctx.use_certificate_file(ssl_cert)
+ sock = socket.socket(self.address_family, self.socket_type)
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2010-07-03 10:56:08 UTC (rev 5733)
@@ -2,7 +2,7 @@
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
-@@ -808,7 +808,8 @@
+@@ -829,7 +829,8 @@
``debug``
Print debugging information. True or False. Default is False.
``editor``
@@ -25,7 +25,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -1054,8 +1054,8 @@
+@@ -1348,8 +1348,8 @@
editor = ui.geteditor()
cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
if not cmdpath:
@@ -38,7 +38,7 @@
ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -384,7 +384,7 @@
+@@ -557,7 +557,7 @@
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
@@ -49,7 +49,7 @@
'''show a progress message
--- a/i18n/da.po
+++ b/i18n/da.po
-@@ -5817,7 +5817,7 @@
+@@ -7103,7 +7103,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -58,27 +58,27 @@
msgstr ""
msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8518,7 +8518,7 @@
+@@ -10199,7 +10199,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"
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
--- a/i18n/de.po
+++ b/i18n/de.po
-@@ -314,7 +314,7 @@
+@@ -340,7 +340,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 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
+@@ -16177,8 +16177,8 @@
msgid "Checking commit editor...\n"
msgstr "Prüfe Editor für Versionsmeldungen...\n"
@@ -91,16 +91,16 @@
msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
--- a/i18n/el.po
+++ b/i18n/el.po
-@@ -225,7 +225,7 @@
+@@ -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"
" 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"
-@@ -5630,7 +5630,7 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
+@@ -11500,7 +11500,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -111,16 +111,16 @@
msgid " (specify a commit editor in your .hgrc file)\n"
--- a/i18n/fr.po
+++ b/i18n/fr.po
-@@ -260,7 +260,7 @@
+@@ -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"
" 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 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
+@@ -8228,7 +8228,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -131,16 +131,16 @@
msgid " (specify a commit editor in your .hgrc file)\n"
--- a/i18n/it.po
+++ b/i18n/it.po
-@@ -181,7 +181,7 @@
+@@ -218,7 +218,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 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
+@@ -6230,8 +6230,8 @@
msgid "Checking commit editor...\n"
msgstr "Sto controllando l'editor per il commit...\n"
@@ -153,7 +153,7 @@
msgstr " (specificare un editore per il commit nel proprio file .hgrc)\n"
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -6171,8 +6171,8 @@
+@@ -7364,8 +7364,8 @@
msgid "Checking commit editor...\n"
msgstr "メッセージ入力用エディタã®æ¤œè¨¼ä¸...\n"
@@ -164,60 +164,57 @@
msgid " (specify a commit editor in your .hgrc file)\n"
msgstr " (コミットメッセージ用エディタをè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -9136,7 +9136,7 @@
+@@ -10735,14 +10735,14 @@
" 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"
-@@ -9228,7 +9228,7 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+ "EDITOR\n"
+ " コミット時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ã‚¨ãƒ‡ã‚£ã‚¿ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€ãƒ¦ãƒ¼ã‚¶ã«ã‚ˆã‚‹\n"
" 編集を促ã™çŠ¶æ³ãŒã‚ã‚Šã¾ã™ã€‚ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€HGEDITORã€VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚ã„ãšã‚Œã‚‚未è¨å®š\n"
--" (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'vi' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
-+" (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'sensible-editor' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
- "\n"
+-" (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'vi' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
++" (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'sensible-editor' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+
+ msgid ""
"PYTHONPATH\n"
- " Mercurial ãŒå½“該システムã®å…±æœ‰é ˜åŸŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã€\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -7487,10 +7487,10 @@
+@@ -8169,8 +8169,8 @@
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"
+-msgstr " Nenhum editor para consolidação configurado, e não foi possÃvel encontrar 'vi' no 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"
++msgstr " Nenhum editor para consolidação configurado, e não foi possÃvel encontrar '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"
-@@ -10583,7 +10583,7 @@
+@@ -11608,7 +11608,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"
-@@ -10675,7 +10675,7 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+ "EDITOR\n"
+ " Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
+@@ -11616,7 +11616,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"
+-" estiverem vazios, o editor será o 'vi'."
++" estiverem vazios, o editor será o 'sensible-editor'."
+
+ msgid ""
"PYTHONPATH\n"
- " Isto é usado pelo Python para localizar módulos importados, e\n"
--- a/i18n/sv.po
+++ b/i18n/sv.po
-@@ -5459,7 +5459,7 @@
+@@ -6784,7 +6784,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -226,18 +223,18 @@
msgstr ""
msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8373,7 +8373,7 @@
+@@ -10043,7 +10043,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"
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
--- a/i18n/zh_CN.po
+++ b/i18n/zh_CN.po
-@@ -5190,7 +5190,7 @@
+@@ -5880,7 +5880,7 @@
msgid "Checking commit editor...\n"
msgstr ""
@@ -246,27 +243,27 @@
msgstr ""
msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -7565,7 +7565,7 @@
+@@ -8768,7 +8768,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"
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
--- a/i18n/zh_TW.po
+++ b/i18n/zh_TW.po
-@@ -182,7 +182,7 @@
+@@ -219,7 +219,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 @@
+-" defaults to 'vi'."
++" defaults to 'sensible-editor'."
+ msgstr ""
+
+ msgid ""
+@@ -6828,7 +6828,7 @@
msgid "Checking commit editor...\n"
msgstr ""
Modified: packages/mercurial/trunk/debian/patches/for_upstream__add_doc_url_in_example_files.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__add_doc_url_in_example_files.patch 2010-07-03 10:30:16 UTC (rev 5732)
+++ packages/mercurial/trunk/debian/patches/for_upstream__add_doc_url_in_example_files.patch 2010-07-03 10:56:08 UTC (rev 5733)
@@ -1,11 +1,11 @@
Add a pointer (URL) on top of the hgwebdir.wsgi file for the corresponding wifi
documentation.
---- a/contrib/hgwebdir.wsgi
-+++ b/contrib/hgwebdir.wsgi
+--- a/contrib/hgweb.wsgi
++++ b/contrib/hgweb.wsgi
@@ -1,4 +1,5 @@
- # An example WSGI (use with mod_wsgi) script to export multiple hgweb repos
+ # An example WSGI for use with mod_wsgi, edit as necessary
+# See http://mercurial.selenic.com/wiki/modwsgi for more information
- # adjust python path if not a system-wide install:
- #import sys
+ # Path to repo or hgweb config to serve (see 'hg help hgweb')
+ config = "/path/to/repo/or/config"
More information about the Python-apps-commits
mailing list