summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2012-10-06 09:18:06 +0000
committerMarkus Meier <maekke@gentoo.org>2012-10-06 09:18:06 +0000
commit8bc9975d21925f7d84b46d18e64fd7e9e8f6dcbd (patch)
tree0d61bc4872680a063d7bf6b9aaba99f78be12154 /dev-util
parentarm stable, bug #427544 (diff)
downloadgentoo-2-8bc9975d21925f7d84b46d18e64fd7e9e8f6dcbd.tar.gz
gentoo-2-8bc9975d21925f7d84b46d18e64fd7e9e8f6dcbd.tar.bz2
gentoo-2-8bc9975d21925f7d84b46d18e64fd7e9e8f6dcbd.zip
arm stable, bug #427544
(Portage version: 2.1.11.23/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/meld-1.6.0.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 99c545addf85..4743eb38c0b6 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.147 2012/10/04 14:51:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.148 2012/10/06 09:18:06 maekke Exp $
+
+ 06 Oct 2012; Markus Meier <maekke@gentoo.org> meld-1.6.0.ebuild:
+ arm stable, bug #427544
04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> meld-1.6.0.ebuild:
Stable for amd64, wrt bug #427544
diff --git a/dev-util/meld/meld-1.6.0.ebuild b/dev-util/meld/meld-1.6.0.ebuild
index f24a3ab6f2ce..2b48dffd3017 100644
--- a/dev-util/meld/meld-1.6.0.ebuild
+++ b/dev-util/meld/meld-1.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.6.0.ebuild,v 1.3 2012/10/04 14:51:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.6.0.ebuild,v 1.4 2012/10/06 09:18:06 maekke 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="doc gnome"
RDEPEND="