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 | 8a38a753c872e40e6cf4874d6de323083a8adf0a (patch) | |
| tree | 25e69572a9a8ec33474d63aaac91b2bfb6d9fa0d /gnome-base | |
| parent | gnome-base/gnome-settings-daemon: remove useless gnome-control-center dep (fi... (diff) | |
| download | historical-8a38a753c872e40e6cf4874d6de323083a8adf0a.tar.gz historical-8a38a753c872e40e6cf4874d6de323083a8adf0a.tar.bz2 historical-8a38a753c872e40e6cf4874d6de323083a8adf0a.zip | |
Restore the blocker on <gnome-control-center-2.22 for file collissions. Wrongly changed and then removed, bug 238705
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild | 5 |
3 files changed, 11 insertions, 5 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/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 7d3b629ec713..b22b323de28e 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,4 +1,4 @@ DIST gnome-settings-daemon-2.22.2.1.tar.bz2 1139262 RMD160 c79d531226f8e58e0acd8f23177a62c8818b70d7 SHA1 0424486b6e53ab0d2dd676c375d02e35341b3a20 SHA256 72cb9aee096019a2925fb5b99a5e880d01f7d529d4c9e75dfbbea1b1f654d7a9 -EBUILD gnome-settings-daemon-2.22.2.1.ebuild 1359 RMD160 c2b1496fd42a387cf5261dd30fae8353c0ebe551 SHA1 b49264432d8a89cda402249b59554a0460072dfa SHA256 887da9a4ee4a2b398a85f739ca6fbc702e0c195cc786c12f56ca5d82627405ab -MISC ChangeLog 2150 RMD160 dd450286e2ec89cbbc66808d78b8d1474c6720ae SHA1 454f6427e7ee2ce91b6ebc4b7e75e17f08ebd084 SHA256 63fb4dff4f0b74abdd61e1fd7b94a1f35e4271e0657fa8b41f9f6cfec7462b03 +EBUILD gnome-settings-daemon-2.22.2.1.ebuild 1401 RMD160 4d2aa55f3911a0d4f6e83f2d5584934cf8b8f289 SHA1 07785f5aa99e9eef5bf34482c2a2e97a05d4bdf1 SHA256 f854a4ce12141167737d9c968cf55a1a346c818658a387db85b742c229c41590 +MISC ChangeLog 2360 RMD160 58eda4ce8f103f24c2afcb594fa6e2be3ade36c6 SHA1 0555aac02c6202be19ba3f822f0f0c1c629c90e9 SHA256 7016ecc10309b745e4c9ae4e7d294110e7cfae4e03b5d512ff61827f9d77139a MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 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 |