[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/6a6c3896c892
branches:  release-2-5-x
changeset: 5990:6a6c3896c892
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Sep 04 15:51:30 2017 +0100
description:
Change license explicitly to GPLv3, cf. MCnet3 agreement.

details:   https://rivet.hepforge.org/hg/rivet/rev/fff2c4cb6bec
branches:  
changeset: 5991:fff2c4cb6bec
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Sep 04 15:52:32 2017 +0100
description:
Merge with 2.5.x

diffs (truncated from 684432 to 50 lines):

--- a/.hgignore	Tue Aug 29 20:14:44 2017 +0100
+++ b/.hgignore	Mon Sep 04 15:52:32 2017 +0100
@@ -69,4 +69,4 @@
 ^Rivet-.\..\..$
 ^local/.*$
 ^(for|analyses)\d\d\d$
-^src/Analyses/.*__all\.cc$
+^analyses/data$
--- a/COPYING	Tue Aug 29 20:14:44 2017 +0100
+++ b/COPYING	Mon Sep 04 15:52:32 2017 +0100
@@ -1,340 +1,1 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and