1 |
dilfridge 11/07/30 12:47:33 |
2 |
|
3 |
Modified: ChangeLog systemsettings-4.7.0.ebuild |
4 |
Log: |
5 |
Add blocker to prevent file collisions, bug 376829 |
6 |
|
7 |
(Portage version: 2.1.10.9/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.112 kde-base/systemsettings/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/ChangeLog?rev=1.112&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/ChangeLog?rev=1.112&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/ChangeLog?r1=1.111&r2=1.112 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v |
19 |
retrieving revision 1.111 |
20 |
retrieving revision 1.112 |
21 |
diff -u -r1.111 -r1.112 |
22 |
--- ChangeLog 27 Jul 2011 14:04:32 -0000 1.111 |
23 |
+++ ChangeLog 30 Jul 2011 12:47:33 -0000 1.112 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for kde-base/systemsettings |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.111 2011/07/27 14:04:32 alexxy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.112 2011/07/30 12:47:33 dilfridge Exp $ |
29 |
+ |
30 |
+ 30 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
31 |
+ systemsettings-4.7.0.ebuild: |
32 |
+ Add blocker to prevent file collisions, bug 376829 |
33 |
|
34 |
*systemsettings-4.7.0 (27 Jul 2011) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 kde-base/systemsettings/systemsettings-4.7.0.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: systemsettings-4.7.0.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- systemsettings-4.7.0.ebuild 27 Jul 2011 14:04:32 -0000 1.1 |
52 |
+++ systemsettings-4.7.0.ebuild 30 Jul 2011 12:47:33 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild,v 1.1 2011/07/27 14:04:32 alexxy Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.0.ebuild,v 1.2 2011/07/30 12:47:33 dilfridge Exp $ |
58 |
|
59 |
EAPI=4 |
60 |
|
61 |
@@ -54,6 +54,7 @@ |
62 |
|
63 |
add_blocker kcontrol '<4.3.98' |
64 |
add_blocker konqueror '<4.4.70' |
65 |
+add_blocker kdeaccessibility-colorschemes '<4.6.50' |
66 |
|
67 |
PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) |