diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2008-01-08 08:22:46 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2008-01-08 08:22:46 +0000 |
| commit | 484e6a048b101a1194843aa50adcb2664ae29a25 (patch) | |
| tree | 4fd2f7f66a6c0bfebccf04b6cdf69b6a1317f004 /profiles | |
| parent | Version bump. (diff) | |
| download | gentoo-2-484e6a048b101a1194843aa50adcb2664ae29a25.tar.gz gentoo-2-484e6a048b101a1194843aa50adcb2664ae29a25.tar.bz2 gentoo-2-484e6a048b101a1194843aa50adcb2664ae29a25.zip | |
Unmask net-im/jabberd2.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 3ab272af9720..91c3178eaac6 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for profile directory # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.979 2008/01/08 08:09:44 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.980 2008/01/08 08:22:46 nelchael Exp $ + + 08 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org> package.mask: + Unmask net-im/jabberd2. 08 Jan 2008; Gunnar Wrobel <wrobel@gentoo.org> package.mask: www-apps/viewcvs: Removed package diff --git a/profiles/package.mask b/profiles/package.mask index f9e7f8669100..d2f842871f82 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8100 2008/01/08 08:09:44 wrobel Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8101 2008/01/08 08:22:46 nelchael Exp $ # When you add an entry to this file, add your name, the date, and an # explanation of why something is getting masked # @@ -573,11 +573,6 @@ sys-kernel/ck-sources >=net-misc/zaptel-1.4.0 >=net-misc/asterisk-1.4.0 -# Krzysiek Pawlik <nelchael@gentoo.org> (08 Oct 2007) -# Masked untill the split from net-im/jabberd is complete. -# See bug #178055 and bug #195091 -net-im/jabberd2 - # Michele Noberasco <s4t4n@gentoo.org) (06 Oct 2007) # Masked pending removal. This package has conflicting # files with net-wireless/irda-utils, which also provides |