summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask5
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 71d033d0ef85..16af784e8ab1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3235 2009/09/07 07:24:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3236 2009/09/07 10:59:41 fauli 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!
+ 07 Sep 2009; Christian Faulhammer <fauli@gentoo.org> package.mask:
+ correct mask for dev-util/bzr and add bzrtools 2.0.0 to masking
+
07 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Unmask FFmpeg snapshot.
diff --git a/profiles/package.mask b/profiles/package.mask
index ec11ec52d6fd..d584dc64d3c7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10416 2009/09/07 07:24:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10417 2009/09/07 10:59:41 fauli 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
@@ -150,7 +150,8 @@ app-emulation/parallels-workstation
# Christian Faulhammer <fauli@gentoo.org> (27 Aug 2009)
# Release candidate
-=dev-tex/bzr-2.0_rc1
+~dev-util/bzr-2.0_rc1
+~dev-util/bzrtools-2.0.0
# Ulrich Mueller <ulm@gentoo.org> (25 Aug 2009)
# Included with GNU Emacs (since version 21 at least).