Changed license to GPL-2+ (from GPL-2only).

This is what Sven and I actually discussed and agreed upon

diff --git a/init.d/nagixsc_conf2http b/init.d/nagixsc_conf2http
index b36f0a2227cb97f955cb6503be2bde942af69a18..48d77065061569fd6b763a85b86f4e6fdbf06b59 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 949895cc85af37743fb91d0065d004e79d910e6e..dd60715b57574e68380f8a79003df24380f22fa8 100644 (file)
--- 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
 #
 # 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
 #
 # 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 030b86da2805ddf724cf9892fb49d4e6a5a2d280..de16082654224f367a259ff8c58e04c2afc45b87 100644 (file)
--- 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
 #
 # 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
 #
 # 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 2a04c2815bbd6a5422f13fac81785144eea48c32..6b063d6d4b15dc58b12e3f8525efe95f29860e37 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 3b9983445e778ed7bd893963da3e1f300ffbcddc..2b5018c723aac08852ba3c00b2d0c4410693e09c 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 4d9d38fb42ed9c5c08d0ba1fe2ba0b7cb02afa34..ce448c0cf93a591dddb39e30e527b5e5ac28f2fa 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 cd5ac0c769612467aa2dfb4694e7598eaa3d05b2..426d5259fb7d892aa54229fb4800ec1dd1fe28c7 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 b4c9bb561dbc365e0af769bb3ca71c9db396bf3e..e479d5f48c794520ffe60e9c1d160ce190ea5a75 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 6531cc80896a9d8316b6f371e92f7ade8e803b6b..76a69b85665940eba25f967ddff215224b21a261 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 cc36317521611d86b36a41b37b7eba80d9ea51f5..5300ecab9fad6a754e2eed323f8567d8c92a9307 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 15ec5a17222303d6bd8121fd54f1265ce7c1d2e2..fae228ee3acd3fe4abced8b0a472fe281eb3d1ed 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 5df8916822b5e85661c41a1933cf8587124398c0..72236e0596606968a186ebcbe00dcefc213b5d0a 100755 (executable)
--- 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
 #
 # 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
 #
 # 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 ee0d4939203c2a2b28c6a91c2adc169e8469b7b3..034d124da2de795c67741ce5cdd15217d72b432b 100644 (file)
--- 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
   -
   - 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
   -
   - 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 68f2503ffb42de802196162228f15f4a5432842b..df7bc7bfea3c0342bef26d1f1b0c790aac912bac 100644 (file)
--- 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
   -
   - 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
   -
   - 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 60d3e93a392fcd5dd6366ac8af10d1e73788e982..7db69c1804a89d746cc7a1c33487c2f8469d5b6d 100644 (file)
--- 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
   -
   - 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
   -
   - 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 b42c6847631167ce2cf07e35586a68dc931b5830..ccb51906785a88932440aba7070a8a1939f45224 100644 (file)
--- 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
   -
   - 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
   -
   - 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 7aeb7402a30ccb2721a51fdd48269384015e9789..79e546e0963cd7d5796795e364fb1f4e35e24db8 100644 (file)
--- 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
   -
   - 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
   -
   - This program is distributed in the hope that it will be useful, but
   - WITHOUT ANY WARRANTY; without even the implied warranty of