| 1 |
ssuominen 10/11/04 15:54:21 |
| 2 |
|
| 3 |
Modified: ChangeLog xfce4-settings-4.7.3.ebuild |
| 4 |
Log: |
| 5 |
Block <libxfcegui4-4.7.0 to avoid conflict with function xfce_shortcuts_provider_set_shortcut. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.56 xfce-base/xfce4-settings/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/ChangeLog?rev=1.56&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/ChangeLog?rev=1.56&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/ChangeLog?r1=1.55&r2=1.56 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v |
| 19 |
retrieving revision 1.55 |
| 20 |
retrieving revision 1.56 |
| 21 |
diff -u -r1.55 -r1.56 |
| 22 |
--- ChangeLog 3 Nov 2010 21:09:08 -0000 1.55 |
| 23 |
+++ ChangeLog 4 Nov 2010 15:54:21 -0000 1.56 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for xfce-base/xfce4-settings |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.55 2010/11/03 21:09:08 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.56 2010/11/04 15:54:21 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 04 Nov 2010; Samuli Suominen <ssuominen@g.o> |
| 31 |
+ xfce4-settings-4.7.3.ebuild: |
| 32 |
+ Block <libxfcegui4-4.7.0 to avoid conflict with function |
| 33 |
+ xfce_shortcuts_provider_set_shortcut. |
| 34 |
|
| 35 |
*xfce4-settings-4.7.3 (03 Nov 2010) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: xfce4-settings-4.7.3.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- xfce4-settings-4.7.3.ebuild 3 Nov 2010 21:09:08 -0000 1.1 |
| 53 |
+++ xfce4-settings-4.7.3.ebuild 4 Nov 2010 15:54:21 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild,v 1.1 2010/11/03 21:09:08 ssuominen Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.7.3.ebuild,v 1.2 2010/11/04 15:54:21 ssuominen Exp $ |
| 59 |
|
| 60 |
EAPI=3 |
| 61 |
inherit xfconf |
| 62 |
@@ -29,7 +29,8 @@ |
| 63 |
libnotify? ( >=x11-libs/libnotify-0.1.3 ) |
| 64 |
keyboard? ( >=x11-libs/libxklavier-0.3 ) |
| 65 |
sound? ( >=media-libs/libcanberra-0.25[sound] ) |
| 66 |
- !<x11-base/xorg-server-1.5.3" |
| 67 |
+ !<x11-base/xorg-server-1.5.3 |
| 68 |
+ !<xfce-base/libxfcegui4-4.7.0" |
| 69 |
DEPEND="${RDEPEND} |
| 70 |
dev-util/intltool |
| 71 |
sys-devel/gettext |
Archives