[Python-apps-commits] r892 - in packages/mercurial/trunk/debian (5 files)
gerardo-guest at users.alioth.debian.org
gerardo-guest at users.alioth.debian.org
Tue Apr 1 00:48:06 UTC 2008
Date: Tuesday, April 1, 2008 @ 00:48:05
Author: gerardo-guest
Revision: 892
* Dropped proposed_upstream__check_hgmerge_args.patch and proposed_upstream__type_is_not_posix.patch.
* Rediff deb_specific__use_sensible-editor.patch against mercurial-1.0
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
packages/mercurial/trunk/debian/patches/series
Deleted:
packages/mercurial/trunk/debian/patches/proposed_upstream__check_hgmerge_args.patch
packages/mercurial/trunk/debian/patches/proposed_upstream__type_is_not_posix.patch
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2008-03-31 23:44:06 UTC (rev 891)
+++ packages/mercurial/trunk/debian/changelog 2008-04-01 00:48:05 UTC (rev 892)
@@ -69,6 +69,14 @@
* also search for .hgrc if mercurial.ini cannot be found
* major speedup of "clone --pull"
+ [Gerardo Curiel]
+ * Fix clean target
+ * Dropped patches:
+ patches/proposed_upstream__check_hgmerge_args.patch
+ patches/proposed_upstream__type_is_not_posix.patch
+ * patches/deb_specific__use_sensible-editor.patch:
+ Rediff against 1.0 branch
+
-- Vincent Danjean <vdanjean at debian.org> Thu, 27 Mar 2008 15:06:09 +0100
mercurial (0.9.5-4) UNRELEASED; urgency=low
Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2008-03-31 23:44:06 UTC (rev 891)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch 2008-04-01 00:48:05 UTC (rev 892)
@@ -1,7 +1,8 @@
-diff -r 434139080ed4 doc/hgrc.5.txt
---- a/doc/hgrc.5.txt Mon Jan 28 22:19:12 2008 -0500
-+++ b/doc/hgrc.5.txt Tue Feb 26 08:58:59 2008 -0600
-@@ -512,7 +512,7 @@ ui::
+Index: mercurial-1.0/doc/hgrc.5.txt
+===================================================================
+--- mercurial-1.0.orig/doc/hgrc.5.txt 2008-03-24 18:35:20.000000000 -0430
++++ mercurial-1.0/doc/hgrc.5.txt 2008-03-31 19:46:08.000000000 -0430
+@@ -534,7 +534,7 @@
debug;;
Print debugging information. True or False. Default is False.
editor;;
@@ -10,10 +11,11 @@
fallbackencoding;;
Encoding to try if it's not possible to decode the changelog using
UTF-8. Default is ISO-8859-1.
-diff -r 434139080ed4 doc/ja/hg.1.ja.txt
---- a/doc/ja/hg.1.ja.txt Mon Jan 28 22:19:12 2008 -0500
-+++ b/doc/ja/hg.1.ja.txt Tue Feb 26 08:58:59 2008 -0600
-@@ -813,7 +813,7 @@ EDITOR::
+Index: mercurial-1.0/doc/ja/hg.1.ja.txt
+===================================================================
+--- mercurial-1.0.orig/doc/ja/hg.1.ja.txt 2008-03-24 18:35:20.000000000 -0430
++++ mercurial-1.0/doc/ja/hg.1.ja.txt 2008-03-31 19:46:08.000000000 -0430
+@@ -813,7 +813,7 @@
EDITOR::
ã“れ㯠hgmerge スクリプトä¸ã§ä½¿ã‚れるエディタã®åå‰ã§ã™ã€‚ã‚‚ã—
HGEDITOR ãŒè¨å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€ã‚³ãƒŸãƒƒãƒˆæ™‚ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ä½¿ã‚
@@ -22,10 +24,11 @@
PYTHONPATH::
ã“ã‚Œã¯ã‚¤ãƒ³ãƒãƒ¼ãƒˆã•ã‚Œã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’見ã¤ã‘ã‚‹ãŸã‚ã« Python ã«ã‚ˆã£
-diff -r 434139080ed4 doc/ja/hgrc.5.ja.txt
---- a/doc/ja/hgrc.5.ja.txt Mon Jan 28 22:19:12 2008 -0500
-+++ b/doc/ja/hgrc.5.ja.txt Tue Feb 26 08:58:59 2008 -0600
-@@ -119,7 +119,7 @@ ui::
+Index: mercurial-1.0/doc/ja/hgrc.5.ja.txt
+===================================================================
+--- mercurial-1.0.orig/doc/ja/hgrc.5.ja.txt 2008-03-24 18:35:20.000000000 -0430
++++ mercurial-1.0/doc/ja/hgrc.5.ja.txt 2008-03-31 19:46:08.000000000 -0430
+@@ -119,7 +119,7 @@
ã§ã¯ False ã§ã™ã€‚
editor;;
コミットä¸ã«ä½¿ç”¨ã™ã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã§ã™ã€‚デフォルト㯠$EDITOR ã‹
@@ -34,9 +37,10 @@
interactive;;
ユーザã«å¯¾ã—ã¦ãƒ—ãƒãƒ³ãƒ—トを出ã™ã‚ˆã†ã«ã—ã¾ã™ã€‚True ã‹ False ã‚’å–
ã‚Šã¾ã™ã€‚デフォルトã§ã¯ True ã§ã™ã€‚
-diff -r 434139080ed4 hgeditor
---- a/hgeditor Mon Jan 28 22:19:12 2008 -0500
-+++ b/hgeditor Tue Feb 26 08:58:59 2008 -0600
+Index: mercurial-1.0/hgeditor
+===================================================================
+--- mercurial-1.0.orig/hgeditor 2008-03-24 18:35:20.000000000 -0430
++++ mercurial-1.0/hgeditor 2008-03-31 19:46:08.000000000 -0430
@@ -7,7 +7,7 @@
# only for Mercurial, modify this:
case "${EDITOR}" in
@@ -46,10 +50,11 @@
;;
emacs)
EDITOR="$EDITOR -nw"
-diff -r 434139080ed4 mercurial/commands.py
---- a/mercurial/commands.py Mon Jan 28 22:19:12 2008 -0500
-+++ b/mercurial/commands.py Tue Feb 26 08:58:59 2008 -0600
-@@ -835,8 +835,8 @@ def debuginstall(ui):
+Index: mercurial-1.0/mercurial/commands.py
+===================================================================
+--- mercurial-1.0.orig/mercurial/commands.py 2008-03-24 18:35:20.000000000 -0430
++++ mercurial-1.0/mercurial/commands.py 2008-03-31 19:46:08.000000000 -0430
+@@ -867,8 +867,8 @@
editor = ui.geteditor()
cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
if not cmdpath:
@@ -60,13 +65,13 @@
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 434139080ed4 mercurial/ui.py
---- a/mercurial/ui.py Mon Jan 28 22:19:12 2008 -0500
-+++ b/mercurial/ui.py Tue Feb 26 08:58:59 2008 -0600
-@@ -476,5 +476,5 @@ class ui(object):
+Index: mercurial-1.0/mercurial/ui.py
+===================================================================
+--- mercurial-1.0.orig/mercurial/ui.py 2008-03-24 18:35:21.000000000 -0430
++++ mercurial-1.0/mercurial/ui.py 2008-03-31 19:50:26.000000000 -0430
+@@ -483,4 +483,4 @@
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"))
-
++ os.environ.get("EDITOR", "sensible-editor"))
Deleted: packages/mercurial/trunk/debian/patches/proposed_upstream__check_hgmerge_args.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__check_hgmerge_args.patch 2008-03-31 23:44:06 UTC (rev 891)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__check_hgmerge_args.patch 2008-04-01 00:48:05 UTC (rev 892)
@@ -1,17 +0,0 @@
-fix bug #443428
-Index: mercurial-0.9.5/hgmerge
-===================================================================
---- mercurial-0.9.5.orig/hgmerge 2007-10-28 21:29:23.000000000 +0100
-+++ mercurial-0.9.5/hgmerge 2007-10-28 21:31:47.000000000 +0100
-@@ -13,6 +13,11 @@
-
- set -e # bail out quickly on failure
-
-+if [ $# != 3 ]; then
-+ echo "Invalid usage of hgmerge. Check manpage" 1>&2
-+ exit 1
-+fi
-+
- LOCAL="$1"
- BASE="$2"
- OTHER="$3"
Deleted: packages/mercurial/trunk/debian/patches/proposed_upstream__type_is_not_posix.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__type_is_not_posix.patch 2008-03-31 23:44:06 UTC (rev 891)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__type_is_not_posix.patch 2008-04-01 00:48:05 UTC (rev 892)
@@ -1,13 +0,0 @@
-type command is not posix. See:
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=397601
-fix bug #447094
-Index: mercurial-0.9.5/hgmerge
-===================================================================
---- mercurial-0.9.5.orig/hgmerge 2007-10-28 17:50:32.000000000 +0100
-+++ mercurial-0.9.5/hgmerge 2007-10-28 17:50:40.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # hgmerge - default merge helper for Mercurial
- #
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2008-03-31 23:44:06 UTC (rev 891)
+++ packages/mercurial/trunk/debian/patches/series 2008-04-01 00:48:05 UTC (rev 892)
@@ -1,7 +1,5 @@
proposed_upstream__extension_syntax.patch
deb_specific__FAQ_subst.patch
-proposed_upstream__type_is_not_posix.patch
-proposed_upstream__check_hgmerge_args.patch
deb_specific__use_sensible-editor.patch
deb_specific__hgk.py.patch
deb_specific__bash_completion_global_option_already_set.patch
More information about the Python-apps-commits
mailing list