[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.2+dfsg-1-21-gf016e47

[Russ Allbery]

The following commit has been merged in the master branch:
commit d643c91a0d69f46e4ba11718ea6ad26a30cd6bdf
Author: Russ Allbery <rra at debian.org>
Date:   Mon Jul 25 16:26:52 2011 -0700

    Copyright updates for the new upstream release

diff --git a/debian/copyright b/debian/copyright
index 28a8e10..5b264ec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,11 +6,13 @@ Comment: The original upstream source was repackaged to remove the
  license.
 
 Files: *
-Copyright: 2001-2011 Internet2
+Copyright: 2001-2011 University Corporation for Advanced Internet
+ Development, Inc. (UCAID)
 License: Apache-2.0
 
 Files: */Makefile.in
-Copyright: 2001-2011 Internet2
+Copyright: 2001-2011 University Corporation for Advanced Internet
+ Development, Inc. (UCAID)
  1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
  2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 License: FSF-unlimited
@@ -135,17 +137,22 @@ Copyright: 2010 The Danish CLARIN Consortium
 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
+ Licensed to the University Corporation for Advanced Internet Development,
+ Inc. (UCAID) under one or more contributor license agreements. See the
+ NOTICE file distributed with this work for additional information
+ regarding copyright ownership.
  .
-    http://www.apache.org/licenses/LICENSE-2.0
+ UCAID 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.
+ 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 complete text of the Apache 2.0 license can be
  found in the file /usr/share/common-licenses/Apache-2.0.

-- 
Debian packaging for the 2.0 Apache Shibboleth SP