[Python-apps-commits] r10334 - in packages/mercurial/branches/wheezy-backports/debian (9 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Wed Jan 8 22:06:53 UTC 2014
Date: Wednesday, January 8, 2014 @ 22:06:52
Author: vicho
Revision: 10334
Merge revisions 10231:10309 from trunk into wheezy-backports
Added:
packages/mercurial/branches/wheezy-backports/debian/source/include-binaries
(from rev 10309, packages/mercurial/trunk/debian/source/include-binaries)
packages/mercurial/branches/wheezy-backports/debian/upstream-signing-key.pgp
(from rev 10309, packages/mercurial/trunk/debian/upstream-signing-key.pgp)
Modified:
packages/mercurial/branches/wheezy-backports/debian/changelog
packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
packages/mercurial/branches/wheezy-backports/debian/patches/series
packages/mercurial/branches/wheezy-backports/debian/watch
Deleted:
packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch
Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog 2014-01-08 22:06:52 UTC (rev 10334)
@@ -1,3 +1,11 @@
+mercurial (2.8.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * Drop for_upstream__fix_i18n.patch as it's now included upstream
+ * Make uscan verify the signature of downloaded tarballs
+
+ -- Javi Merino <vicho at debian.org> Thu, 02 Jan 2014 17:31:05 +0100
+
mercurial (2.8.1-2~bpo70+1) wheezy-backports; urgency=medium
* Rebuild for wheezy-backports.
Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__optional-dependencies 2014-01-08 22:06:52 UTC (rev 10334)
@@ -116,7 +116,7 @@
try:
from svn.core import SubversionException, Pool
-@@ -236,16 +237,19 @@ class svn_source(converter_source):
+@@ -237,16 +238,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 = {}
-@@ -1024,6 +1028,8 @@ class svn_sink(converter_sink, commandli
+@@ -1025,6 +1029,8 @@ class svn_sink(converter_sink, commandli
return self.join('hg-authormap')
def __init__(self, ui, path):
Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__support_templates_in_fsh.patch 2014-01-08 22:06:52 UTC (rev 10334)
@@ -4,7 +4,7 @@
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
-@@ -373,7 +373,7 @@ funcs = {
+@@ -375,7 +375,7 @@ funcs = {
# template engine
Modified: packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/deb_specific__use_sensible-editor.patch 2014-01-08 22:06:52 UTC (rev 10334)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -2091,8 +2091,8 @@ def debuginstall(ui):
+@@ -2095,8 +2095,8 @@ def debuginstall(ui):
editor = ui.geteditor()
cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
if not cmdpath:
@@ -170,7 +170,7 @@
msgid ""
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -11950,8 +11950,8 @@ msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹
+@@ -11954,8 +11954,8 @@ msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹
msgid "checking commit editor...\n"
msgstr "メッセージ入力用エディタã®ç¢ºèªä¸...\n"
@@ -181,7 +181,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (コミットãƒã‚°ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -18513,11 +18513,12 @@ msgstr ""
+@@ -18499,11 +18499,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -196,7 +196,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -19675,7 +19676,7 @@ msgid ""
+@@ -19662,7 +19663,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"
@@ -205,7 +205,7 @@
msgstr ""
"EDITOR\n"
" コミットãƒã‚°å…¥åŠ›æ™‚ã®ã‚ˆã†ã«ã€ エディタã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€\n"
-@@ -19683,7 +19684,7 @@ msgstr ""
+@@ -19670,7 +19671,7 @@ msgstr ""
" ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€ HGEDITOR〠VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚\n"
@@ -216,7 +216,7 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -12119,10 +12119,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -12122,10 +12122,10 @@ msgstr " (modelos parecem ter sido insta
msgid "checking commit editor...\n"
msgstr "verificando editor para consolidação...\n"
@@ -229,7 +229,7 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
-@@ -18854,10 +18854,12 @@ msgstr ""
+@@ -18837,10 +18837,12 @@ msgstr ""
msgid ""
"``editor``\n"
@@ -244,7 +244,7 @@
msgid ""
"``fallbackencoding``\n"
-@@ -20047,7 +20049,7 @@ msgid ""
+@@ -20030,7 +20032,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 +253,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -20055,7 +20057,7 @@ msgstr ""
+@@ -20038,7 +20040,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"
Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/for_upstream__fix_i18n.patch 2014-01-08 22:06:52 UTC (rev 10334)
@@ -1,17 +0,0 @@
-Author: Tristan Seligmann <mithrandi at debian.org>
-Description: Add missing import in check-translation.py
- An import is missing in this script, which in turn causes test-i18n.t to fail.
-Bug: http://bz.selenic.com/show_bug.cgi?id=4122
-
-Index: mercurial-2.8.1/i18n/check-translation.py
-===================================================================
---- mercurial-2.8.1.orig/i18n/check-translation.py 2013-12-02 04:51:10.000000000 +0200
-+++ mercurial-2.8.1/i18n/check-translation.py 2013-12-06 00:20:52.192369115 +0200
-@@ -122,6 +122,7 @@
- (options, args) = optparser.parse_args()
-
- if options.doctest:
-+ import os
- if 'TERM' in os.environ:
- del os.environ['TERM']
- import doctest
Modified: packages/mercurial/branches/wheezy-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/series 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/series 2014-01-08 22:06:52 UTC (rev 10334)
@@ -8,5 +8,4 @@
deb_specific__disable_libdir_replacement.patch
deb_specific__fix_hg-ssh_interpreter.patch
for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
-for_upstream__fix_i18n.patch
for_upstream__lenient_test-shelve.patch
Copied: packages/mercurial/branches/wheezy-backports/debian/source/include-binaries (from rev 10309, packages/mercurial/trunk/debian/source/include-binaries)
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/source/include-binaries (rev 0)
+++ packages/mercurial/branches/wheezy-backports/debian/source/include-binaries 2014-01-08 22:06:52 UTC (rev 10334)
@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp
Copied: packages/mercurial/branches/wheezy-backports/debian/upstream-signing-key.pgp (from rev 10309, packages/mercurial/trunk/debian/upstream-signing-key.pgp)
===================================================================
(Binary files differ)
Modified: packages/mercurial/branches/wheezy-backports/debian/watch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/watch 2014-01-05 22:33:01 UTC (rev 10333)
+++ packages/mercurial/branches/wheezy-backports/debian/watch 2014-01-08 22:06:52 UTC (rev 10334)
@@ -1,5 +1,5 @@
# format version number, currently 3; this line is compulsory!
version=3
-opts="uversionmangle=s/-rc/~rc/" \
+opts="uversionmangle=s/-rc/~rc/,pgpsigurlmangle=s/$/.asc/" \
http://www.selenic.com/mercurial/release/mercurial-(.*)\.tar\.gz
More information about the Python-apps-commits
mailing list