diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:39:41 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:39:41 +0000 |
| commit | e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d (patch) | |
| tree | d9416d5a487ce2c5d71fc6a57e99da1baa6eb0e0 | |
| parent | Marking gimp-help-2.4.2 ppc64 for bug 252653 (diff) | |
| download | gentoo-2-e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d.tar.gz gentoo-2-e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d.tar.bz2 gentoo-2-e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/libkonq/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/libkonq/libkonq-4.2.1.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog index f072b2d0406e..7f870fa55e2a 100644 --- a/kde-base/libkonq/ChangeLog +++ b/kde-base/libkonq/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/libkonq # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.111 2009/03/08 22:56:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.112 2009/03/15 14:39:41 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild: Revert wrongly commited new eclass behavior. diff --git a/kde-base/libkonq/libkonq-4.2.1.ebuild b/kde-base/libkonq/libkonq-4.2.1.ebuild index 01642cd437a9..96e0c10b0ddc 100644 --- a/kde-base/libkonq/libkonq-4.2.1.ebuild +++ b/kde-base/libkonq/libkonq-4.2.1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.2.1.ebuild,v 1.3 2009/03/08 22:56:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-4.2.1.ebuild,v 1.4 2009/03/15 14:39:41 scarabeus Exp $ EAPI="2" -KMNAME="kdebase" -KMMODULE="apps/lib/konq/" +KMNAME="kdebase-apps" +KMMODULE="lib/konq" CPPUNIT_REQUIRED="optional" inherit kde4-meta |