<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-infrastructure.

</pre>
<p><a href="https://github.com/macports/macports-infrastructure/commit/7fc116fa2a5f9ed96efec115395bf930fc4701fb">https://github.com/macports/macports-infrastructure/commit/7fc116fa2a5f9ed96efec115395bf930fc4701fb</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 7fc116f  Revert "distributable_lib: consolidate cc-by conflicts"
</span>7fc116f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7fc116fa2a5f9ed96efec115395bf930fc4701fb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Sep 19 00:16:17 2022 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Revert "distributable_lib: consolidate cc-by conflicts"
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This reverts commit d6e9913a8ba1fbe47c8c322425def3f4b66f0800.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    CC-BY-4 is GPL-compatible.
</span>---
 jobs/distributable_lib.tcl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/jobs/distributable_lib.tcl b/jobs/distributable_lib.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f5555a..9211584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/jobs/distributable_lib.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/jobs/distributable_lib.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,10 @@ array set license_conflicts \
</span>     apsl [list agpl cecill gpl] \
     beopen [list agpl cecill gpl] \
     bsd-old [list agpl cecill gpl] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    cc-by [list agpl cecill gpl] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cc-by-1 [list agpl cecill gpl] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cc-by-2 [list agpl cecill gpl] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cc-by-2.5 [list agpl cecill gpl] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cc-by-3 [list agpl cecill gpl] \
</span>     cc-by-sa [list agpl cecill gpl] \
     cddl [list agpl cecill gpl] \
     cecill [list afl agpl apache apsl beopen bsd-old cc-by-1 cc-by-2 cc-by-2.5 cc-by-3 cc-by-sa cddl cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1] \
</pre><pre style='margin:0'>

</pre>