License changed to Apache License 2.0

Update packaging license to follow this also.

2 files changed, 19 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index c6d61a7..847cf33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
 python-bleach (1.4-1) unstable; urgency=low
 
   * New upstream release
+    - License changed to Apache License 2.0
     - Add python*-six to Build-Dependends
   * Shipping both python2 and python3 packages
     - Add python3-html5lib to Build-Dependends
   * Running tests during build
     - Add python*-nose Build-Dependends
+  * Packaging license changed to Apache License 2.0
 
  -- Per Andersson <avtobiff@gmail.com>  Fri, 14 Feb 2014 00:59:20 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 36ff473..d1548fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,49 +3,25 @@ Upstream-Name: Bleach
 Source: http://github.com/jsocol/bleach/
 
 Files: *
-Copyright: 2012-2012 James Socol <james@mozilla.com>
-License:
- Copyright (c) 2010, Mozilla Foundation
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
- .
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
- .
-     3. Neither the name of bleach nor the names of its contributors may
-        be used to endorse or promote products derived from this software
-        without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright: 2012-2014 James Socol <james@mozilla.com>
+License: Apache-2.0
 
 Files: debian/*
-Copyright: 2012 Per Andersson <avtobiff@gmail.com>
-License: WTFPLv2
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
- .
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+Copyright: 2012-2014 Per Andersson <avtobiff@gmail.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ 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
  .
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
+     http://www.apache.org/licenses/LICENSE-2.0
  .
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 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.
  .
-  0. You just DO WHAT THE FUCK YOU WANT TO.
+ On Debian systems, the full text of the Apache License version 2.0 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.