summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/updates/3Q-20122
2 files changed, 6 insertions, 1 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0c5a1ce06a63..5ce980e816a0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6963 2012/09/15 11:46:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6964 2012/09/16 02:50:45 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!
+ 16 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> updates/3Q-2012:
+ Slotmove grilo-0.1.x to match pkgconfig name, in preparation for grilo-0.2.
+
15 Sep 2012; Pacho Ramos <pacho@gentoo.org> package.mask:
Mask newer gtkam versions due gphoto-2.5 requirement.
diff --git a/profiles/updates/3Q-2012 b/profiles/updates/3Q-2012
index 8df9db7fddbf..a87c5d546267 100644
--- a/profiles/updates/3Q-2012
+++ b/profiles/updates/3Q-2012
@@ -43,3 +43,5 @@ move net-analyzer/nagios-nrpe net-analyzer/nrpe
move dev-ruby/ruby-dbi dev-ruby/dbi
move app-arch/TheUnarchiver app-arch/unar
slotmove =media-libs/gst-plugins-bad-0.10* 0 0.10
+slotmove <media-libs/grilo-0.2 0 0.1
+slotmove <media-plugins/grilo-plugins-0.2 0 0.1