summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-base/control-center/ChangeLog7
-rw-r--r--gnome-base/control-center/Manifest12
-rw-r--r--gnome-base/control-center/control-center-2.12.2-r1.ebuild6
3 files changed, 16 insertions, 9 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 6045546c3baf..dfdc03d027e3 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/control-center
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.145 2005/12/14 20:29:03 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.146 2005/12/26 17:54:14 cardoe Exp $
+
+ 26 Dec 2005; Doug Goldstein <cardoe@gentoo.org>
+ control-center-2.12.2-r1.ebuild:
+ Adding xinit dep since it's needed to get rid of .Xsession-errors with
+ gnome-settings-daemon... Modular X depend
14 Dec 2005; <dang@gentoo.org> control-center-2.12.2-r1.ebuild:
Fix modular X deps to not dup gtk+ ones
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 2f6495b7224b..229cbdfc2590 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 48c65ba841a9c6c2d7f072857be2058d ChangeLog 19056
+MD5 7909a387a1c5062d027c24e996c20a05 ChangeLog 19261
MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
MD5 c2f9837fa0e285c242254804a8980bc4 control-center-1.4.0.5-r2.ebuild 1411
MD5 f591b4d2e1987a08027ebfa25c396f36 control-center-2.10.2.ebuild 2013
MD5 fb5ca50373f5813456ab01b99119916c control-center-2.12.1.ebuild 2523
-MD5 1d53b74866dfe9b4643443f60718cae7 control-center-2.12.2-r1.ebuild 2538
+MD5 a592afc78d83776f7fe57de3781893e6 control-center-2.12.2-r1.ebuild 2563
MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
@@ -22,9 +22,9 @@ MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
MD5 ee57d7f95478cf42c392dd7c457d4fe7 files/digest-control-center-2.12.2-r1 75
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDoIB9omPajV0RnrERAshYAJ97oipTMsU63TQN46cbvsH1VajwbgCfSh4Q
-Pfc1scrEpx2l8O5UyZ3SPz8=
-=YcW/
+iD8DBQFDsC5SBtvusYtCZMsRAjFIAJ9PqDfPqvgI4x7YsJTOTSBe0lfBBACaA7fK
+ahzk4SK4/p98TVKIHeC5FvE=
+=Sib6
-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.12.2-r1.ebuild b/gnome-base/control-center/control-center-2.12.2-r1.ebuild
index a5d64c62b294..eecfaf48128b 100644
--- a/gnome-base/control-center/control-center-2.12.2-r1.ebuild
+++ b/gnome-base/control-center/control-center-2.12.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.2-r1.ebuild,v 1.2 2005/12/14 20:29:03 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.2-r1.ebuild,v 1.3 2005/12/26 17:54:14 cardoe Exp $
inherit eutils gnome2 autotools
@@ -15,7 +15,9 @@ IUSE="alsa eds gstreamer"
RDEPEND=">=gnome-base/gnome-vfs-2.2
>=media-libs/fontconfig-1
virtual/xft
- || ( x11-libs/libXxf86misc virtual/x11 )
+ || ( ( x11-libs/libXxf86misc
+ x11-apps/xinit )
+ virtual/x11 )
>=x11-libs/gtk+-2.6
>=gnome-base/libbonobo-2
>=gnome-base/libgnomeui-2.2