Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center: ChangeLog gnome-control-center-3.2.2.ebuild gnome-control-center-3.2.1.ebuild
Date: Mon, 28 Nov 2011 17:35:06
Message-Id: 20111128173455.890DD2004B@flycatcher.gentoo.org
1 tetromino 11/11/28 17:34:55
2
3 Modified: ChangeLog gnome-control-center-3.2.2.ebuild
4 gnome-control-center-3.2.1.ebuild
5 Log:
6 Add blocker on <gnome-settings-daemon-2.91.90 due to 50-accessibility.xml file collision (bug #392283, thanks to Sebastian Pipping for reporting).
7
8 (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.94 gnome-base/gnome-control-center/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?rev=1.94&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?rev=1.94&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?r1=1.93&r2=1.94
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v
20 retrieving revision 1.93
21 retrieving revision 1.94
22 diff -u -r1.93 -r1.94
23 --- ChangeLog 13 Nov 2011 18:02:54 -0000 1.93
24 +++ ChangeLog 28 Nov 2011 17:34:55 -0000 1.94
25 @@ -1,6 +1,11 @@
26 # ChangeLog for gnome-base/gnome-control-center
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.93 2011/11/13 18:02:54 tetromino Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.94 2011/11/28 17:34:55 tetromino Exp $
30 +
31 + 28 Nov 2011; Alexandre Rostovtsev <tetromino@g.o>
32 + gnome-control-center-3.2.1.ebuild, gnome-control-center-3.2.2.ebuild:
33 + Add blocker on <gnome-settings-daemon-2.91.90 due to 50-accessibility.xml
34 + file collision (bug #392283, thanks to Sebastian Pipping for reporting).
35
36 *gnome-control-center-3.2.2 (13 Nov 2011)
37
38
39
40
41 1.2 gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild?rev=1.2&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild?rev=1.2&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild?r1=1.1&r2=1.2
46
47 Index: gnome-control-center-3.2.2.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v
50 retrieving revision 1.1
51 retrieving revision 1.2
52 diff -u -r1.1 -r1.2
53 --- gnome-control-center-3.2.2.ebuild 13 Nov 2011 18:02:54 -0000 1.1
54 +++ gnome-control-center-3.2.2.ebuild 28 Nov 2011 17:34:55 -0000 1.2
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2011 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v 1.1 2011/11/13 18:02:54 tetromino Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v 1.2 2011/11/28 17:34:55 tetromino Exp $
60
61 EAPI="4"
62 GCONF_DEBUG="yes"
63 @@ -67,10 +67,11 @@
64 sys-apps/accountsservice
65 cups? ( net-print/cups-pk-helper )
66
67 + !<gnome-base/gdm-2.91.94
68 + !<gnome-base/gnome-settings-daemon-2.91.90
69 !<gnome-extra/gnome-color-manager-3.1.2
70 !gnome-extra/gnome-media[pulseaudio]
71 - !<gnome-extra/gnome-media-2.32.0-r300
72 - !<gnome-base/gdm-2.91.94"
73 + !<gnome-extra/gnome-media-2.32.0-r300"
74 # PDEPEND to avoid circular dependency
75 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
76 DEPEND="${COMMON_DEPEND}
77
78
79
80 1.2 gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild?rev=1.2&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild?rev=1.2&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild?r1=1.1&r2=1.2
85
86 Index: gnome-control-center-3.2.1.ebuild
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild,v
89 retrieving revision 1.1
90 retrieving revision 1.2
91 diff -u -r1.1 -r1.2
92 --- gnome-control-center-3.2.1.ebuild 29 Oct 2011 06:53:44 -0000 1.1
93 +++ gnome-control-center-3.2.1.ebuild 28 Nov 2011 17:34:55 -0000 1.2
94 @@ -1,6 +1,6 @@
95 # Copyright 1999-2011 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild,v 1.1 2011/10/29 06:53:44 tetromino Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild,v 1.2 2011/11/28 17:34:55 tetromino Exp $
99
100 EAPI="4"
101 GCONF_DEBUG="yes"
102 @@ -67,10 +67,11 @@
103 sys-apps/accountsservice
104 cups? ( net-print/cups-pk-helper )
105
106 + !<gnome-base/gdm-2.91.94
107 + !<gnome-base/gnome-settings-daemon-2.91.90
108 !<gnome-extra/gnome-color-manager-3.1.2
109 !gnome-extra/gnome-media[pulseaudio]
110 - !<gnome-extra/gnome-media-2.32.0-r300
111 - !<gnome-base/gdm-2.91.94"
112 + !<gnome-extra/gnome-media-2.32.0-r300"
113 # PDEPEND to avoid circular dependency
114 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
115 DEPEND="${COMMON_DEPEND}