diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2008-09-26 08:35:21 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2008-09-26 08:35:21 +0000 |
| commit | f718435f9760655811ddd7b69047b7f16824a336 (patch) | |
| tree | bcbca4d2c213bd08805c27e0c5495923489a55ef /gnome-base | |
| parent | gnome-base/gnome-settings-daemon: remove useless gnome-control-center dep (fi... (diff) | |
| download | gentoo-2-f718435f9760655811ddd7b69047b7f16824a336.tar.gz gentoo-2-f718435f9760655811ddd7b69047b7f16824a336.tar.bz2 gentoo-2-f718435f9760655811ddd7b69047b7f16824a336.zip | |
Restore the blocker on <gnome-control-center-2.22 for file collissions. Wrongly changed and then removed, bug 238705
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index aa7961081e6a..c7cba1e052c4 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.12 2008/09/26 08:11:54 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.13 2008/09/26 08:35:21 leio Exp $ + + 26 Sep 2008; Mart Raudsepp <leio@gentoo.org> + gnome-settings-daemon-2.22.2.1.ebuild: + Restore the blocker on <gnome-control-center-2.22 for file collissions. + Wrongly changed and then removed, bug 238705 26 Sep 2008; Rémi Cardona <remi@gentoo.org> gnome-settings-daemon-2.22.2.1.ebuild: diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild index 7d10a3ebab03..9cea5d4c9361 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 2008-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild,v 1.10 2008/09/26 08:11:54 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild,v 1.11 2008/09/26 08:35:21 leio Exp $ inherit eutils gnome2 @@ -36,7 +36,8 @@ RDEPEND=">=dev-libs/dbus-glib-0.74 gstreamer? ( >=media-libs/gstreamer-0.10.1.2 >=media-libs/gst-plugins-base-0.10.1.2 - )" + ) + !<gnome-base/gnome-control-center-2.22" DEPEND="${RDEPEND} sys-devel/gettext >=dev-util/intltool-0.35.0 |