diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2013-10-21 06:18:12 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2013-10-21 06:18:12 +0000 |
| commit | 3ec290b510a234b0a92b195a676fb356a851aeb2 (patch) | |
| tree | 97d3d3bd3c8629015c21363f6ee4f521dce442e1 /profiles | |
| parent | Version bump. (diff) | |
| download | historical-3ec290b510a234b0a92b195a676fb356a851aeb2.tar.gz historical-3ec290b510a234b0a92b195a676fb356a851aeb2.tar.bz2 historical-3ec290b510a234b0a92b195a676fb356a851aeb2.zip | |
Also mask relevant asset pipeline packages for Rails 3.1, fixing bug 488824 and 488826.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/package.mask | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 2f5c15da295d..67787eafacde 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8317 2013/10/21 03:08:54 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8318 2013/10/21 06:18:12 graaff 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! + 21 Oct 2013; Hans de Graaff <graaff@gentoo.org> package.mask: + Also mask relevant asset pipeline packages for Rails 3.1, fixing bug 488824 + and 488826. + 21 Oct 2013; Mike Gilbert <floppym@gentoo.org> package.mask: Mask media-fonts/unifont-6.3 diff --git a/profiles/package.mask b/profiles/package.mask index 890f92c697cb..c0cbe4c15dd4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,6 +1,6 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15172 2013/10/21 03:08:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15173 2013/10/21 06:18:12 graaff 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 @@ -59,6 +59,8 @@ dev-ruby/activesupport:3.1 dev-ruby/arel:2.1 dev-ruby/mail:2.3 dev-ruby/sprockets:2.0 +=dev-ruby/coffee-rails-3.1.1 +=dev-ruby/sass-rails-3.1.5 # Markos Chandras <hwoarang@gentoo.org> (18 Oct 2013) # Masked for testing |