r71950 - in /trunk/libapache2-mod-perl2/debian: changelog copyright

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Thu Mar 24 21:28:33 2011
New Revision: 71950

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=71950
Log:
resolved copyright issues

Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/copyright

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=71950&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Thu Mar 24 21:28:33 2011
@@ -2,8 +2,6 @@
 
   TODO:
   - DEB_BUILD_OPTIONS does not seem to work
-  - Check copyright
-    1.) Is the Apache license stanza correct
   - Resolve doc-base issues
     Idea: support text, html, pdf
         text: pod2text

Modified: trunk/libapache2-mod-perl2/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/copyright?rev=71950&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/copyright (original)
+++ trunk/libapache2-mod-perl2/debian/copyright Thu Mar 24 21:28:33 2011
@@ -44,21 +44,15 @@
 License: Apache-2.0
 
 License: Apache-2.0
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
- .
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
      http://www.apache.org/licenses/LICENSE-2.0
- .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  .
- On Debian systems the Apache License 2.0 can be found at
- `/usr/share/common-licenses/Apache-2.0'.
-
+ On Debian systems, the complete text of the Apache License,
+ Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'.