diff options
author | Arno Töll <debian@toell.net> | 2012-03-18 01:07:27 +0100 |
---|---|---|
committer | Arno Töll <debian@toell.net> | 2012-03-18 01:07:27 +0100 |
commit | 7fb464c5074335f2fc6cd4e0fe702223ce7cefdf (patch) | |
tree | 7745d2c93af25ed03f0e623f44e6faf1c39f9cca /debian | |
parent | 3cf842b8894366d4b19bc82f5d30d536e7f62017 (diff) | |
download | apache2-7fb464c5074335f2fc6cd4e0fe702223ce7cefdf.tar.gz |
Change apache2-maintscript-helper license to MIT. It's basically the same
wording, but using a well known license instead of own wording
Diffstat (limited to 'debian')
-rw-r--r-- | debian/copyright | 28 | ||||
-rw-r--r-- | debian/debhelper/apache2-maintscript-helper | 23 |
2 files changed, 33 insertions, 18 deletions
diff --git a/debian/copyright b/debian/copyright index c6a973c4..71d2eb5d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,7 +56,7 @@ License: Apache 2.0 or GPL-2+ Files: debian/debhelper/apache2-maintscript-helper Copyright: 2012 Arno Töll -License: Free for all +License: MIT Files: debian/a2enmod Copyright: 2008 Stefan Fritsch @@ -429,13 +429,21 @@ License: Custom C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. -License: Free for all - As a special exception this file is not subject to any copyright and released - to the general public without any restriction in inclusion, embedding, - modification or distribution of this file. It can be included and used in any - other program without limitation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +License: MIT + 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/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper index 48f58167..679175ff 100644 --- a/debian/debhelper/apache2-maintscript-helper +++ b/debian/debhelper/apache2-maintscript-helper @@ -1,15 +1,22 @@ # apache2-maintscript-helper - Apache2 helper function for maintainer scripts # Copyright (C) 2012 Arno Töll <debian@toell.net> # -# As a special exception this file is not subject to any copyright and released -# to the general public without any restriction in inclusion, embedding, -# modification or distribution of this file. It can be included and used in any -# other program without limitation. +# 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: # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - +# 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. EXPORT_APACHE2_MAINTSCRIPT_HELPER=1 |