[DRE-commits] [SCM] ruby-hpricot.git branch, master, updated. upstream/0.8.4-9-gbf69e58

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit bf69e589f562ce7577d6b67f75ba156831a5def2
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Aug 20 14:42:43 2011 +0200

    correct copyright assignments

diff --git a/debian/copyright b/debian/copyright
index 71ea8b1..8563aa1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,24 @@ Upstream-Name: hpricot
 Source: https://github.com/hpricot/hpricot
 
 Files: *
-Copyright: Copyright 2006 why the lucky stiff
-License: MIT
+Copyright: Copyright 2006, 2008, 2010 why the lucky stiff
+License: Expat
+
+Files: ext/fast_xs/FastXsService.java
+Copyright: Copyright 2002-2005 The Apache Software Foundation
+           Copyright 2006 why the lucky stiff
+License: Apache 2.0 and Expat
+Comment: Mostly Expat, but one class is licensed Apache 2.0
+
+Files: lib/hpricot/blankslate.rb
+Copyright: Copyright 2004 Jim Weirich (jim at weirichhouse.org)
+License: other
 
 Files: debian/*
 Copyright: Copyright 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
-License: MIT
+License: Expat
 
-License: MIT
+License: Expat
  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
@@ -28,3 +38,27 @@ License: MIT
  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.
+
+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
+ .
+      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.
+
+License: other
+ All rights reserved.
+ .
+ Permission is granted for use, copying, modification, distribution,
+ and distribution of modified versions of this work as long as the
+ above copyright notice is included.
+

-- 
ruby-hpricot.git