diff options
author | Agostino Sarubbo <ago@gentoo.org> | 2013-04-01 17:54:34 +0000 |
---|---|---|
committer | Agostino Sarubbo <ago@gentoo.org> | 2013-04-01 17:54:34 +0000 |
commit | fc4b4b399fdb90358e86117e2198cb12202e83e2 (patch) | |
tree | fe61efc94549a0e8b0598406da2a82545b7fddd2 /dev-util/meld | |
parent | Stable for alpha, wrt bug #458984 (diff) | |
download | gentoo-2-fc4b4b399fdb90358e86117e2198cb12202e83e2.tar.gz gentoo-2-fc4b4b399fdb90358e86117e2198cb12202e83e2.tar.bz2 gentoo-2-fc4b4b399fdb90358e86117e2198cb12202e83e2.zip |
Stable for alpha, wrt bug #458984
(Portage version: 2.1.11.55/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7194459F)
Diffstat (limited to 'dev-util/meld')
-rw-r--r-- | dev-util/meld/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/meld/meld-1.7.0.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 492ae2e6041e..3c1c4924840a 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/meld # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.163 2013/03/31 04:18:04 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.164 2013/04/01 17:54:34 ago Exp $ + + 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild: + Stable for alpha, wrt bug #458984 31 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> meld-1.7.1.ebuild: Fix .desktop file sed. diff --git a/dev-util/meld/meld-1.7.0.ebuild b/dev-util/meld/meld-1.7.0.ebuild index f8bb42d29f7f..2df5ec65f188 100644 --- a/dev-util/meld/meld-1.7.0.ebuild +++ b/dev-util/meld/meld-1.7.0.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-util/meld/meld-1.7.0.ebuild,v 1.7 2013/03/29 13:32:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.8 2013/04/01 17:54:34 ago Exp $ EAPI="4" GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://meldmerge.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+highlight gnome" RDEPEND=">=dev-python/pygtk-2.14:2 |