[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 11e1ce03cb975f75588c2e61b94301c1187a6556

[Arno Töll]

The following commit has been merged in the next branch:
commit 7fb464c5074335f2fc6cd4e0fe702223ce7cefdf
Author: Arno Töll <debian at toell.net>
Date:   Sun Mar 18 01:07:27 2012 +0100

    Change apache2-maintscript-helper license to MIT. It's basically the same
    wording, but using a well known license instead of own wording

diff --git a/debian/copyright b/debian/copyright
index c6a973c..71d2eb5 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 48f5816..679175f 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 at 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
 

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)