r29797 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl.pm

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Jan 17 23:06:46 2009
New Revision: 29797

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29797
Log:
Add the Apache License, Version 2.0 to the list of recognized licenses
(closes: #511588).

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=29797&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat Jan 17 23:06:46 2009
@@ -19,6 +19,8 @@
     again.
   * "--help": use pod2usage() instead of the hand-crafted usage_instructions()
     method, duplicate maintainance of documentation is error-prone.
+  * Add the Apache License, Version 2.0 to the list of recognized licenses
+    (closes: #511588).
 
  -- Damyan Ivanov <dmn at debian.org>  Fri, 09 Jan 2009 11:38:50 +0200
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=29797&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Sat Jan 17 23:06:46 2009
@@ -1379,6 +1379,18 @@
             . "    option) any later version\n"
             . "    On Debian GNU/Linux systems, the complete text of version 3 of the GNU\n"
             . "    General Public License can be found in `/usr/share/common-licenses/GPL-3'",
+        'Apache-2.0' =>
+            "    Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+            . "    you may not use this file except in compliance with the License.\n"
+            . "    You may obtain a copy of the License at\n"
+            . "        http://www.apache.org/licenses/LICENSE-2.0\n"
+            . "    Unless required by applicable law or agreed to in writing, software\n"
+            . "    distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+            . "    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+            . "    See the License for the specific language governing permissions and\n"
+            . "    limitations under the License.\n"
+            . "    On Debian GNU/Linux systems, the complete text of the Apache License,\n"
+            . "    Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'",
         'unparsable' =>
             "    No known license could be automatically determined for this module.\n"
             . "    If this module conforms to a commonly used license, please report this\n"
@@ -1430,6 +1442,10 @@
 
             if ( $mangle_cprt =~ /Artistic\s*License/is ) {
                 $licenses{'Artistic'} = 1;
+            }
+
+            if ( $mangle_cprt =~ /Apache\s*License.*2\.0/is ) {
+                $licenses{'Apache-2.0'} = 1;
             }
 
             # Other licenses?