summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-03-05 03:44:16 +0000
committerMike Gilbert <floppym@gentoo.org>2013-03-05 03:44:16 +0000
commit9f89f3d2f335904419474c7d00223454588eee56 (patch)
tree305794f913de740b794cf9363237795920b14548 /dev-vcs
parentAdd proxy-maintainers herd. (diff)
downloadgentoo-2-9f89f3d2f335904419474c7d00223454588eee56.tar.gz
gentoo-2-9f89f3d2f335904419474c7d00223454588eee56.tar.bz2
gentoo-2-9f89f3d2f335904419474c7d00223454588eee56.zip
Install mergetools.rc as documentation, bug 460364.
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/tortoisehg/ChangeLog6
-rw-r--r--dev-vcs/tortoisehg/tortoisehg-2.7.ebuild4
-rw-r--r--dev-vcs/tortoisehg/tortoisehg-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 7afd6ee25a81..b599a20805b7 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-vcs/tortoisehg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.34 2013/03/05 03:34:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.35 2013/03/05 03:44:16 floppym Exp $
+
+ 05 Mar 2013; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.7.ebuild,
+ tortoisehg-9999.ebuild:
+ Install mergetools.rc as documentation, bug 460364.
05 Mar 2013; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.7.ebuild,
tortoisehg-9999.ebuild:
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild
index be8fcf0340c5..5b4d48612339 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild,v 1.4 2013/03/05 03:34:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.ebuild,v 1.5 2013/03/05 03:44:16 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -63,7 +63,7 @@ python_compile_all() {
python_install_all() {
distutils-r1_python_install_all
- dodoc doc/ReadMe*.txt doc/TODO
+ dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
if use doc ; then
dohtml -r doc/build/html/
fi
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 787db9750e75..56e7f74a58db 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.18 2013/03/05 03:34:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.19 2013/03/05 03:44:16 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -63,7 +63,7 @@ python_compile_all() {
python_install_all() {
distutils-r1_python_install_all
- dodoc doc/ReadMe*.txt doc/TODO
+ dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc
if use doc ; then
dohtml -r doc/build/html/
fi