1 |
leio 08/09/26 08:35:21 |
2 |
|
3 |
Modified: gnome-settings-daemon-2.22.2.1.ebuild ChangeLog |
4 |
Log: |
5 |
Restore the blocker on <gnome-control-center-2.22 for file collissions. Wrongly changed and then removed, bug 238705 |
6 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.11 gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild?rev=1.11&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild?rev=1.11&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild?r1=1.10&r2=1.11 |
14 |
|
15 |
Index: gnome-settings-daemon-2.22.2.1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.22.2.1.ebuild,v |
18 |
retrieving revision 1.10 |
19 |
retrieving revision 1.11 |
20 |
diff -u -r1.10 -r1.11 |
21 |
--- gnome-settings-daemon-2.22.2.1.ebuild 26 Sep 2008 08:11:54 -0000 1.10 |
22 |
+++ gnome-settings-daemon-2.22.2.1.ebuild 26 Sep 2008 08:35:21 -0000 1.11 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 2008-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $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 $ |
27 |
+# $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 $ |
28 |
|
29 |
inherit eutils gnome2 |
30 |
|
31 |
@@ -36,7 +36,8 @@ |
32 |
gstreamer? ( |
33 |
>=media-libs/gstreamer-0.10.1.2 |
34 |
>=media-libs/gst-plugins-base-0.10.1.2 |
35 |
- )" |
36 |
+ ) |
37 |
+ !<gnome-base/gnome-control-center-2.22" |
38 |
DEPEND="${RDEPEND} |
39 |
sys-devel/gettext |
40 |
>=dev-util/intltool-0.35.0 |
41 |
|
42 |
|
43 |
|
44 |
1.13 gnome-base/gnome-settings-daemon/ChangeLog |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?rev=1.13&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?rev=1.13&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?r1=1.12&r2=1.13 |
49 |
|
50 |
Index: ChangeLog |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v |
53 |
retrieving revision 1.12 |
54 |
retrieving revision 1.13 |
55 |
diff -u -r1.12 -r1.13 |
56 |
--- ChangeLog 26 Sep 2008 08:11:54 -0000 1.12 |
57 |
+++ ChangeLog 26 Sep 2008 08:35:21 -0000 1.13 |
58 |
@@ -1,6 +1,11 @@ |
59 |
# ChangeLog for gnome-base/gnome-settings-daemon |
60 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.12 2008/09/26 08:11:54 remi Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.13 2008/09/26 08:35:21 leio Exp $ |
63 |
+ |
64 |
+ 26 Sep 2008; Mart Raudsepp <leio@g.o> |
65 |
+ gnome-settings-daemon-2.22.2.1.ebuild: |
66 |
+ Restore the blocker on <gnome-control-center-2.22 for file collissions. |
67 |
+ Wrongly changed and then removed, bug 238705 |
68 |
|
69 |
26 Sep 2008; RĂ©mi Cardona <remi@g.o> |
70 |
gnome-settings-daemon-2.22.2.1.ebuild: |