summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2015-02-28 17:17:24 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2015-02-28 17:17:24 +0000
commitfd1235ad61e464da20c167487318ce0c29407e20 (patch)
treed1a87facf32b70d637cd086a75fdb4c103fca2b2 /profiles
parentVersion bump; thanks to jospezial (diff)
downloadgentoo-2-fd1235ad61e464da20c167487318ce0c29407e20.tar.gz
gentoo-2-fd1235ad61e464da20c167487318ce0c29407e20.tar.bz2
gentoo-2-fd1235ad61e464da20c167487318ce0c29407e20.zip
Add dev-libs/libzypp to zypper mask too.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0984de40c21f..656d2070dc8d 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.9831 2015/02/28 15:47:12 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9832 2015/02/28 17:17:24 scarabeus 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!
+ 28 Feb 2015; Tomáš Chvátal <scarabeus@gentoo.org> package.mask:
+ Add dev-libs/libzypp to zypper mask too.
+
28 Feb 2015; Manuel Rüger <mrueg@gentoo.org> package.mask:
Keep dev-ruby/mixlib-shellout in tree.
diff --git a/profiles/package.mask b/profiles/package.mask
index c3181259f5da..598ed4c0de32 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16391 2015/02/28 15:47:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16392 2015/02/28 17:17:24 scarabeus 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
@@ -35,6 +35,7 @@
# to keep here. Remove in 30 days.
dev-libs/libsolv
app-admin/zypper
+dev-libs/libzypp
# Justin Lecher <jlec@gentoo.org> (28 Feb 2015)
# Unfixed security problems