From f9b578c5cfcfa46cf69f51f7f7fb24bd3442e608 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 4 Mar 2011 16:01:24 +0100 Subject: [PATCH] Changed license to GPL-2+ (from GPL-2only). This is what Sven and I actually discussed and agreed upon --- init.d/nagixsc_conf2http | 3 ++- init.d/nagixsc_http2nagios | 3 ++- nagixsc/__init__.py | 3 ++- nagixsc_conf2http.py | 3 ++- nagixsc_conf2xml.py | 3 ++- nagixsc_http2nagios.py | 3 ++- nagixsc_live2xml.py | 3 ++- nagixsc_read_xml.py | 3 ++- nagixsc_write_xml.py | 3 ++- nagixsc_xml2cfg.py | 3 ++- nagixsc_xml2nagios.py | 3 ++- obsess_daemon.py | 3 ++- xml/dtd_no_timestamp.xml | 3 ++- xml/dtd_test.xml | 3 ++- xml/nagixsc.dtd | 3 ++- xml/nagixsc.xml | 3 ++- xml/nagixsc.xsd | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/init.d/nagixsc_conf2http b/init.d/nagixsc_conf2http index b36f0a2..48d7706 100755 --- a/init.d/nagixsc_conf2http +++ b/init.d/nagixsc_conf2http @@ -7,7 +7,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/init.d/nagixsc_http2nagios b/init.d/nagixsc_http2nagios index 949895c..dd60715 100644 --- a/init.d/nagixsc_http2nagios +++ b/init.d/nagixsc_http2nagios @@ -7,7 +7,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc/__init__.py b/nagixsc/__init__.py index 030b86d..de16082 100644 --- a/nagixsc/__init__.py +++ b/nagixsc/__init__.py @@ -4,7 +4,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_conf2http.py b/nagixsc_conf2http.py index 2a04c28..6b063d6 100755 --- a/nagixsc_conf2http.py +++ b/nagixsc_conf2http.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_conf2xml.py b/nagixsc_conf2xml.py index 3b99834..2b5018c 100755 --- a/nagixsc_conf2xml.py +++ b/nagixsc_conf2xml.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_http2nagios.py b/nagixsc_http2nagios.py index 4d9d38f..ce448c0 100755 --- a/nagixsc_http2nagios.py +++ b/nagixsc_http2nagios.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_live2xml.py b/nagixsc_live2xml.py index cd5ac0c..426d525 100755 --- a/nagixsc_live2xml.py +++ b/nagixsc_live2xml.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_read_xml.py b/nagixsc_read_xml.py index b4c9bb5..e479d5f 100755 --- a/nagixsc_read_xml.py +++ b/nagixsc_read_xml.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_write_xml.py b/nagixsc_write_xml.py index 6531cc8..76a69b8 100755 --- a/nagixsc_write_xml.py +++ b/nagixsc_write_xml.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_xml2cfg.py b/nagixsc_xml2cfg.py index cc36317..5300eca 100755 --- a/nagixsc_xml2cfg.py +++ b/nagixsc_xml2cfg.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/nagixsc_xml2nagios.py b/nagixsc_xml2nagios.py index 15ec5a1..fae228e 100755 --- a/nagixsc_xml2nagios.py +++ b/nagixsc_xml2nagios.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/obsess_daemon.py b/obsess_daemon.py index 5df8916..72236e0 100755 --- a/obsess_daemon.py +++ b/obsess_daemon.py @@ -6,7 +6,8 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License is applicable. +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/xml/dtd_no_timestamp.xml b/xml/dtd_no_timestamp.xml index ee0d493..034d124 100644 --- a/xml/dtd_no_timestamp.xml +++ b/xml/dtd_no_timestamp.xml @@ -5,7 +5,8 @@ - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - - Free Software Foundation; only version 2 of the License is applicable. + - Free Software Foundation; either version 2 of the License, or (at your + - option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/xml/dtd_test.xml b/xml/dtd_test.xml index 68f2503..df7bc7b 100644 --- a/xml/dtd_test.xml +++ b/xml/dtd_test.xml @@ -4,7 +4,8 @@ - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - - Free Software Foundation; only version 2 of the License is applicable. + - Free Software Foundation; either version 2 of the License, or (at your + - option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/xml/nagixsc.dtd b/xml/nagixsc.dtd index 60d3e93..7db69c1 100644 --- a/xml/nagixsc.dtd +++ b/xml/nagixsc.dtd @@ -3,7 +3,8 @@ - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - - Free Software Foundation; only version 2 of the License is applicable. + - Free Software Foundation; either version 2 of the License, or (at your + - option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/xml/nagixsc.xml b/xml/nagixsc.xml index b42c684..ccb5190 100644 --- a/xml/nagixsc.xml +++ b/xml/nagixsc.xml @@ -5,7 +5,8 @@ - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - - Free Software Foundation; only version 2 of the License is applicable. + - Free Software Foundation; either version 2 of the License, or (at your + - option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/xml/nagixsc.xsd b/xml/nagixsc.xsd index 7aeb740..79e546e 100644 --- a/xml/nagixsc.xsd +++ b/xml/nagixsc.xsd @@ -3,7 +3,8 @@ - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - - Free Software Foundation; only version 2 of the License is applicable. + - Free Software Foundation; either version 2 of the License, or (at your + - option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of -- 2.30.2