summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-03-08 05:03:27 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-03-08 05:03:27 +0000
commit7d8bce02e115eaeca4603e0124a2abec0186499c (patch)
treea51c5fe328c2b6b8cba9f7dddbd00676899e2cde /profiles
parentRespect pkg-config library path in FindBLAS, bug 399755 (diff)
downloadhistorical-7d8bce02e115eaeca4603e0124a2abec0186499c.tar.gz
historical-7d8bce02e115eaeca4603e0124a2abec0186499c.tar.bz2
historical-7d8bce02e115eaeca4603e0124a2abec0186499c.zip
Slotmove the former sunrise overlay version of nautilus-actions to prevent collision with the ebuilds that were added to portage.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/updates/1Q-20121
2 files changed, 6 insertions, 1 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5bc0962ce2b6..908bd184d920 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6288 2012/03/07 22:05:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6289 2012/03/08 05:03:26 tetromino Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 08 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> updates/1Q-2012:
+ Slotmove the former sunrise overlay version of nautilus-actions to prevent
+ collision with the ebuilds that were added to portage.
+
07 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.mask:
Update mask for xorg-server-1.12 release.
diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
index 36254a1018a8..bf13a40961b2 100644
--- a/profiles/updates/1Q-2012
+++ b/profiles/updates/1Q-2012
@@ -10,3 +10,4 @@ move app-shells/prll sys-process/prll
move net-wireless/wispy-tools net-wireless/spectools
slotmove dev-ruby/syslogger 3 0
move kde-misc/konq-plugins kde-base/konq-plugins
+slotmove <gnome-extra/nautilus-actions-3.2.2 0 2