summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-01-08 12:49:11 +0000
committerJustin Lecher <jlec@gentoo.org>2015-01-08 12:49:11 +0000
commit538dccc21e7c95cc11bbe81f9265de746078b767 (patch)
tree562f8713c81c282776ab0e4fcb5af4ff3ad4283f /profiles
parentAdd myself as maintainer (diff)
downloadgentoo-2-538dccc21e7c95cc11bbe81f9265de746078b767.tar.gz
gentoo-2-538dccc21e7c95cc11bbe81f9265de746078b767.tar.bz2
gentoo-2-538dccc21e7c95cc11bbe81f9265de746078b767.zip
Resolve file collision for sci-libs/Fiona between SLOTs
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/updates/1Q-20152
2 files changed, 7 insertions, 1 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 88af6c91dad3..b1ba13887176 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9669 2015/01/08 12:19:45 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9670 2015/01/08 12:49:11 jlec 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 Jan 2015; Justin Lecher <jlec@gentoo.org> +updates/1Q-2015:
+ Resolve file collision for sci-libs/Fiona between SLOTs
+
08 Jan 2015; Eray Aslan <eras@gentoo.org> package.mask:
Unmask mail-client/squirrelmail-1.4.23_pre - bug #524238
@@ -28,6 +31,7 @@
05 Jan 2015; Tony Vroon <chainsaw@gentoo.org> package.mask:
Mask Asterisk 13 branch.
+>>>>>>> 1.9669
01 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> package.mask:
Remove obsolete dev-perl masks.
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
new file mode 100644
index 000000000000..28fcc7e643f8
--- /dev/null
+++ b/profiles/updates/1Q-2015
@@ -0,0 +1,2 @@
+slotmove sci-libs/Fiona 1.1 0
+slotmove sci-libs/Fiona 1.4 0