From a57a4908bfe0489db90bf08745ec4cb6389ad870 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 15 Jul 2005 22:37:13 +0000 Subject: [PATCH] Absorbed LICENSE.log4py inside a copyright file so to make lintian shut up --- LICENSE.log4py | 20 -------------------- debian/copyright | 29 ++++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 LICENSE.log4py diff --git a/LICENSE.log4py b/LICENSE.log4py deleted file mode 100644 index 4f384c3f..00000000 --- a/LICENSE.log4py +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2001 Martin Preishuber - -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/debian/copyright b/debian/copyright index 4c6643e0..d647b8fa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,11 +6,6 @@ pointed from the project page of the upstream author Cyril Jaquier: http://fail2ban.sourceforge.net -log4py.py module included in this package is distributed in complience -with MIT License provided in -/usr/share/doc/fail2ban/LICENSE.log4py. -log4py copyright is owned by the author: Martin Preishuber. - Copyright: This program is free software; you can redistribute it and/or modify @@ -29,3 +24,27 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. See /usr/share/common-licenses/GPL for the full license. + +log4py.py module included in this package is distributed in complience +with MIT License: + +Copyright (c) 2001 Martin Preishuber + +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.