summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 399f29c5991f..b9744351b5b8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5863 2011/11/03 16:23:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5864 2011/11/04 12:13:55 aballier 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!
+ 04 Nov 2011; Alexis Ballier <aballier@gentoo.org> package.mask:
+ mask prerelease of vlc 1.2
+
03 Nov 2011; Mike Gilbert <floppym@gentoo.org> package.mask:
Update dev channel mask for www-client/google-chrome-17.
diff --git a/profiles/package.mask b/profiles/package.mask
index 47e108ed5e85..f4dc56fd05b3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13199 2011/11/03 16:23:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13200 2011/11/04 12:13:55 aballier Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# Alexis Ballier <aballier@gentoo.org> (04 Nov 2011)
+# Pre-releases of vlc 1.2. Mask it until final version is out
+>=media-video/vlc-1.2_pre
+
# Mike Gilbert <floppym@gentoo.org> (03 Nov 2011)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.