From 7d2b1a35b31e14739ffc191dea4106b73bb651ce Mon Sep 17 00:00:00 2001 From: rohieb Date: Mon, 21 Jul 2008 19:15:59 +0200 Subject: [PATCH] removed double license files (lintian is angry about it) --- Makefile | 2 +- doc/LICENSE | 46 ---------------------------------- doc/LICENSE.de | 67 -------------------------------------------------- 3 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 doc/LICENSE delete mode 100644 doc/LICENSE.de diff --git a/Makefile b/Makefile index 69370d7..75f86dc 100755 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ MKDIR=mkdir -p links: # documentation $(MKDIR) $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/ - $(LN) doc/{LICENSE*,TODO,changelog*} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/ + $(LN) doc/{TODO,changelog.html} $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/ $(LN) doc/source/html/* $(DESTDIR)/usr/share/doc/iserv/mod/room-reservation/source/ # images diff --git a/doc/LICENSE b/doc/LICENSE deleted file mode 100644 index 117b83d..0000000 --- a/doc/LICENSE +++ /dev/null @@ -1,46 +0,0 @@ -== License == - -The module has been released under the terms of the MIT License, as printed -following in its original version. Some images which have been used have been -released under the terms of the GNU Lesser General Public License (see -http://www.fsf.org/licensing/licenses/lgpl.html). These are in particular: - * /usr/share/iserv/www/img/default/16/mod_room-reservation_config.png - * /usr/share/iserv/www/img/default/16/mod_room-reservation_index.png - * /usr/share/iserv/www/img/default/32/mod_room-reservation_config.png - * /usr/share/iserv/www/img/default/32/mod_room-reservation_index.png - -If you enjoy this software, you are free to support his author with a small -donation: - - Roland Hieber - IBAN: DE98 250 500 000 150 2141 79 - BIC: NOLADE2HXXX (Braunschweigische Landessparkasse) - -You can also send material donations to - Roland Hieber - 21944471 - Packstation 103 - 38106 Braunschweig - GERMANY - - -=== License terms === -Copyright (c) 2007 Roland Hieber - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/doc/LICENSE.de b/doc/LICENSE.de deleted file mode 100644 index 0a0c9ef..0000000 --- a/doc/LICENSE.de +++ /dev/null @@ -1,67 +0,0 @@ -== Lizenz == - -Das Modul wurde unter der MIT-Lizenz veröffentlicht, die nachfolgend in ihrer -Originalversion wiedergegeben ist. Einige Symbole, die benutzt werden, wurden -unter der GNU Lesser General Public License veröffentlicht (siehe -http://www.fsf.org/licensing/licenses/lgpl.html). Dies sind im folgenden: - * /usr/share/iserv/www/img/default/16/mod_room-reservation_config.png - * /usr/share/iserv/www/img/default/16/mod_room-reservation_index.png - * /usr/share/iserv/www/img/default/32/mod_room-reservation_config.png - * /usr/share/iserv/www/img/default/32/mod_room-reservation_index.png - -Das Modul ist Donationware, d. h. wenn der Benutzer Gefallen daran findet, -ist es ihm freigestellt, den Autor mit einer kleinen Spende zu unterstützen: - - Roland Hieber - Kto. Nr. 150 214 179 - Braunschweigische Landessparkasse - BLZ 250 500 00 - -Materielle Spenden an: - Roland Hieber - 21944471 - Packstation 103 - 38106 Braunschweig - - -=== Lizenztext === -Copyright (c) 2008 Roland Hieber - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -=== Deutsche Übersetzung: === -Copyright (c) 2008 Roland Hieber - -Hiermit wird die Erlaubnis an jede Person, die eine Kopie der Software und der -zugehörigen Dokumentationen (der "Software") erhält, gegeben, die Software -kostenlos zu benutzen, inklusive dem Recht, diese zu verändern, fusionieren, -verlegen, verbreiten, unterlizenzieren und/oder verkaufen, und Personen, die -diese Software erhalten, diese Rechte zu geben, unter den nachfolgenden -Bedingungen: - -Der obige Urheberrechtsvermerk und dieser Erlaubnisvermerk sind in alle Kopien -oder Teilkopien der Software zu inkludieren. - -DIE SOFTWARE WIRD OHNE JEDE SPEZIELLE ODER IMPLIZIERTE GARANTIE VERGEBEN, DIES -SCHLIESST DIE GARANTIE ZUR BENUTZUNG FÜR EINEN BESTIMMTEN ZWECK UND RECHTS- -VERLETZUNG EIN, IST ABER NICHT DARAUF BESCHRÄNKT. AUF KEINEN FALL SIND DIE -AUTOREN ODER COPYRIGHTINHABER FÜR JEGLICHEN SCHADEN VERANTWORTLICH, OB IN EINEM -VERTRAG, DELIKT ODER ANDERS, WELCHER DURCH DIE BENUTZUNG DER SOFTWARE ENTSTEHT. - -- 2.20.1