[Python-apps-commits] r8575 - in packages/mercurial/trunk/debian (7 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Tue May 1 22:26:46 UTC 2012
Date: Tuesday, May 1, 2012 @ 22:26:45
Author: vicho
Revision: 8575
Refresh patches
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
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__optional-dependencies
packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/changelog 2012-05-01 22:26:45 UTC (rev 8575)
@@ -4,8 +4,9 @@
* Delete patches for_upstream__skip_test_gpg_if_not_mercurial_wd.patch
and from_upstream__tests_re_silence_test_bad_pull_log_messages.patch
which are now included upstream
+ * Refresh patches
- -- Javi Merino <vicho at debian.org> Tue, 01 May 2012 22:25:52 +0100
+ -- Javi Merino <vicho at debian.org> Tue, 01 May 2012 22:37:52 +0100
mercurial (2.1.2-2) unstable; urgency=low
Modified: packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/patches/deb_specific__disable_libdir_replacement.patch 2012-05-01 22:26:45 UTC (rev 8575)
@@ -12,7 +12,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -375,8 +375,7 @@
+@@ -381,8 +381,7 @@
'build_mo': hgbuildmo,
'build_ext': hgbuildext,
'build_py': hgbuildpy,
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately 2012-05-01 22:26:45 UTC (rev 8575)
@@ -2,7 +2,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -418,8 +418,7 @@
+@@ -424,8 +424,7 @@
extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-mo-fhs.patch 2012-05-01 22:26:45 UTC (rev 8575)
@@ -12,7 +12,7 @@
break
--- a/setup.py
+++ b/setup.py
-@@ -418,7 +418,7 @@
+@@ -424,7 +424,7 @@
extmodules.append(inotify)
packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2012-05-01 22:26:45 UTC (rev 8575)
@@ -13,7 +13,7 @@
def _flatten(thing):
--- a/setup.py
+++ b/setup.py
-@@ -424,14 +424,6 @@
+@@ -430,14 +430,6 @@
def ordinarypath(p):
return p and p[0] != '.' and p[-1] != '~'
Modified: packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/patches/deb_specific__optional-dependencies 2012-05-01 22:26:45 UTC (rev 8575)
@@ -2,7 +2,7 @@
--- a/hgext/bugzilla.py
+++ b/hgext/bugzilla.py
-@@ -316,7 +316,8 @@
+@@ -352,7 +352,8 @@
import MySQLdb as mysql
bzmysql._MySQLdb = mysql
except ImportError, err:
@@ -16,7 +16,7 @@
+++ b/hgext/convert/bzr.py
@@ -44,7 +44,8 @@
# access bzrlib stuff
- branch
+ bzrdir
except NameError:
- raise NoRepo(_('Bazaar modules could not be loaded'))
+ raise NoRepo(_('Bazaar modules could not be loaded') +
@@ -108,7 +108,7 @@
if self.automatestdio:
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
-@@ -21,6 +21,7 @@
+@@ -18,6 +18,7 @@
from common import NoRepo, MissingTool, commit, encodeargs, decodeargs
from common import commandline, converter_source, converter_sink, mapfile
@@ -116,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -230,16 +231,19 @@
+@@ -227,16 +228,19 @@
raise NoRepo(_("%s does not look like a Subversion repository")
% url)
if svn is None:
@@ -139,7 +139,7 @@
self.lastrevs = {}
-@@ -979,6 +983,8 @@
+@@ -1001,6 +1005,8 @@
return self.join('hg-authormap')
def __init__(self, ui, path):
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2012-05-01 22:26:39 UTC (rev 8574)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2012-05-01 22:26:45 UTC (rev 8575)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -1902,8 +1902,8 @@
+@@ -1966,8 +1966,8 @@
editor = ui.geteditor()
cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
if not cmdpath:
@@ -26,15 +26,15 @@
else:
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -687,7 +687,7 @@
+@@ -693,7 +693,7 @@
+ # avoid confusion.
+ editor = 'E'
+ else:
+- editor = 'vi'
++ editor = 'sensible-editor'
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or
-- os.environ.get("EDITOR", "vi"))
-+ os.environ.get("EDITOR", "sensible-editor"))
-
- def progress(self, topic, pos, item="", unit="", total=None):
- '''show a progress message
--- a/i18n/da.po
+++ b/i18n/da.po
@@ -8752,7 +8752,7 @@
@@ -57,7 +57,7 @@
msgid ""
--- a/i18n/de.po
+++ b/i18n/de.po
-@@ -9951,8 +9951,8 @@
+@@ -10140,8 +10140,8 @@
msgid "Checking commit editor...\n"
msgstr "Prüfe Editor für Versionsmeldungen...\n"
@@ -68,7 +68,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -15794,7 +15794,7 @@
+@@ -16050,7 +16050,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"
@@ -77,12 +77,12 @@
msgstr ""
"EDITOR\n"
" Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -15802,7 +15802,7 @@
- " Nachricht geschrieben wird. Der verwendete Editor wird aus den drei\n"
- " Umgebungsvariablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge)\n"
- " ermittelt. Der erste nicht-leere wird verwendet. Wenn alle Angaben\n"
--" leer sind, wird der Standard 'vi' verwendet."
-+" leer sind, wird der Standard 'sensible-editor' verwendet."
+@@ -16059,7 +16059,7 @@
+ " variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
+ "ermittelt.\n"
+ " Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind, wird\n"
+-" der Standard 'vi' verwendet."
++" der Standard 'sensible-editor' verwendet."
msgid ""
"PYTHONPATH\n"
@@ -150,7 +150,7 @@
msgid ""
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -10104,8 +10104,8 @@
+@@ -10602,8 +10602,8 @@
msgid "Checking commit editor...\n"
msgstr "メッセージ入力用エディタã®æ¤œè¨¼ä¸...\n"
@@ -161,7 +161,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (コミットメッセージ用エディタをè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -16117,7 +16117,8 @@
+@@ -16823,7 +16823,8 @@
msgid ""
"``editor``\n"
@@ -171,7 +171,7 @@
msgstr ""
"``editor``\n"
" コミットãƒã‚°å…¥åŠ›ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã€‚ 無指定ã®å ´åˆã€ ``$EDITOR`` ãªã„ã—\n"
-@@ -17116,7 +17117,7 @@
+@@ -17832,7 +17833,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"
@@ -180,7 +180,7 @@
msgstr ""
"EDITOR\n"
" コミット時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ エディタã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€\n"
-@@ -17124,7 +17125,7 @@
+@@ -17840,7 +17841,7 @@
" ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€ HGEDITOR〠VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚\n"
@@ -191,7 +191,7 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -10417,10 +10417,10 @@
+@@ -10753,10 +10753,10 @@
msgid "Checking commit editor...\n"
msgstr "Verificando editor para consolidação...\n"
@@ -204,7 +204,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
-@@ -16580,10 +16580,12 @@
+@@ -17128,10 +17128,12 @@
msgid ""
"``editor``\n"
@@ -219,7 +219,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -17603,7 +17605,7 @@
+@@ -18162,7 +18164,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"
@@ -228,7 +228,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -17611,7 +17613,7 @@
+@@ -18170,7 +18172,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"
@@ -324,7 +324,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
-@@ -1055,7 +1055,8 @@
+@@ -1123,7 +1123,8 @@
Print debugging information. True or False. Default is False.
``editor``
More information about the Python-apps-commits
mailing list