| 1 |
commit: a5f6d81b77e4d5390144f3f22f9eb7d8b2b1c708 |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Sep 27 17:34:06 2013 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Sep 27 17:34:06 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a5f6d81b |
| 7 |
|
| 8 |
Merge branch 'master' of github.com:gentoo-science/sci |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
sys-cluster/charm/ChangeLog |
| 12 |
|
| 13 |
|
| 14 |
sys-cluster/charm/ChangeLog | 4 ++++ |
| 15 |
1 file changed, 4 insertions(+) |
| 16 |
|
| 17 |
diff --cc sys-cluster/charm/ChangeLog |
| 18 |
index ace12f1,2ff10b6..492cc96 |
| 19 |
--- a/sys-cluster/charm/ChangeLog |
| 20 |
+++ b/sys-cluster/charm/ChangeLog |
| 21 |
@@@ -2,14 -2,10 +2,18 @@@ |
| 22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 27 Sep 2013; Nicolas Bock <nicolasbock@×××××.com> |
| 26 |
+ +files/charm-6.5.1-charmc-gentoo.patch, charm-6.5.1-r1.ebuild, |
| 27 |
+ files/charm-6.5.1-CkReductionMgr.patch, |
| 28 |
+ files/charm-6.5.1-cleanup-config.patch, |
| 29 |
+ files/charm-6.5.1-fix-string-parsing.patch: |
| 30 |
+ sys-clyster/charm-6.5.1-r1: Fix missing DEPEND. This addresses bug 486202. |
| 31 |
+ The ebuild had a missing DEPEND using the doc USE flag. |
| 32 |
+ |
| 33 |
+ 27 Sep 2013; Christoph Junghans <ottxor@g.o> |
| 34 |
+ files/charm-6.5.1-fix-string-parsing.patch: |
| 35 |
+ fix broken patch |
| 36 |
+ |
| 37 |
14 Sep 2013; Nicolas Bock <nicolasbock@×××××.com> |
| 38 |
files/charm-6.5.1-fix-string-parsing.patch: |
| 39 |
sys-cluster/charm-6.5.1: Small fix in patch to make printing less verbose. |
Archives