[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.3.1+dfsg-2-25-gb8bef97

Russ Allbery rra at debian.org
Thu Apr 7 03:26:22 UTC 2011 

The following commit has been merged in the master branch:
commit aff0fb5d39516f52d7ac5e04284e51572d9fa618
Author: Russ Allbery <rra at debian.org>
Date:   Wed Apr 6 20:06:20 2011 -0700

    Update debian/copyright to the current DEP-5 specification

diff --git a/debian/changelog b/debian/changelog
index decd5af..a968c08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ shibboleth-sp2 (2.4.2+dfsg-1) UNRELEASED; urgency=low
     - Allow overriding listener details to permit use of a shared config
     - Add error information to attribute ResolutionContext
     - Multiple bug fixes
+  * Update debian/copyright to the current DEP-5 specification.
 
  -- Russ Allbery <rra at debian.org>  Mon, 29 Nov 2010 15:54:07 -0800
 
diff --git a/debian/copyright b/debian/copyright
index aeac3cd..ca86c0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,19 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Internet2
-Packaged-By: Ferenc Wágner <wferi at niif.hu>
-Packaged-Date: Mon, 28 Apr 2008 14:55:31 +0200
-Original-Source-Location:
- http://shibboleth.internet2.edu/downloads/shibboleth/cpp/2.1/
-
-The original upstream source was repackaged to remove the WS-Trust.xsd
-schema, which was not distributed under a DFSG-free license.
+Format-Specification:
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Source: http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/
+Comment: The original upstream source was repackaged to remove the
+ WS-Trust.xsd schema, which was not distributed under a DFSG-free
+ license.
 
 Files: *
-Copyright: 2001-2009 Internet2
+Copyright: 2001-2011 Internet2
 License: Apache-2.0
 
 Files: */Makefile.in
-Copyright: 2001-2009 Internet2
- 2004 Oren Ben-Kiki
- 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
-License: other
+Copyright: 2001-2011 Internet2
+ 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+License: FSF-unlimited
  This Makefile.in is free software; the Free Software Foundation
  gives unlimited permission to copy and/or distribute it,
  with or without modifications, as long as this notice is preserved.
@@ -27,10 +23,11 @@ License: other
  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE.
 
-Files: ./aclocal.m4
-Copyright: 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
-License: other
+Files: aclocal.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
+ m4/lt~obsolete.m4
+Copyright: 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+License: FSF-unlimited
  This file is free software; the Free Software Foundation
  gives unlimited permission to copy and/or distribute it,
  with or without modifications, as long as this notice is preserved.
@@ -40,9 +37,75 @@ License: other
  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE.
 
-Files: ./acx_pthread.m4
+Files: build-aux/config.guess build-aux/config.sub build-aux/depcomp
+ build-aux/missing
+Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+ Inc.
+License: GPL-2+ or configure-same-as-package
+ This file is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ Public License for more details.
+ .
+ The full text of the GNU General Public License version 2 is available on
+ Debian systems in /usr/share/common-licenses/GPL-2.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a configuration
+ script generated by Autoconf, you may include it under the same
+ distribution terms that you use for the rest of that program.
+
+Files: build-aux/ltmain.sh m4/libtool.m4
+Copyright: 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+ 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+License: GPL-2+ or libtool-same-as-package
+ GNU Libtool is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ As a special exception to the GNU General Public License,
+ if you distribute this file as part of a program or library that
+ is built using GNU Libtool, you may include this file under the
+ same distribution terms that you use for the rest of that program.
+ .
+ GNU Libtool is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+Files: build-aux/install-sh
+Copyright: (C) 1994 X Consortium
+License: Expat
+
+Files: configure
+Copyright: 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
+ 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+ Inc.
+License: FSF-configure-unlimited
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+Files: debian/*
+Copyright: 2008 Ferenc Wágner <wferi at niif.hu>
+ 2008, 2009, 2010, 2011 Russ Allbery <rra at debian.org>
+License: Expat
+
+Files: doxygen.am m4/doxygen.m4
+Copyright: 2004 Oren Ben-Kiki
+License: FSF-unlimited
+
+Files: m4/acx_pthread.m4 m4/ax_create_pkgconfig_info.m4
 Copyright: 2006 Steven G. Johnson <stevenj at alum.mit.edu>
-License: GPL-2+ | other
+ 2008 Guido U. Draheim <guidod at gmx.de>
+ 2008 Sven Verdoolaege <skimo at kotnet.org>
+License: GPL-2+ or macro-archive-same-as-package
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
  Free Software Foundation; either version 2 of the License, or (at your
@@ -69,55 +132,25 @@ License: GPL-2+ | other
  distribute a modified version of the Autoconf Macro, you may extend this
  special exception to the GPL to apply to your modified version as well.
 
-Files: ./config.guess, ./config.sub, ./depcomp, ./libtool.m4, ./ltmain.sh,
- ./missing
-Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-License: GPL-2+ | other
- This file is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
- Public License for more details.
+Files: shibsp/attribute/Base64AttributeDecoder.cpp
+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
  .
- The full text of the GNU General Public License version 2 is available on
- Debian systems in /usr/share/common-licenses/GPL-2.
+    http://www.apache.org/licenses/LICENSE-2.0
  .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a configuration
- script generated by Autoconf, you may include it under the same
- distribution terms that you use for the rest of that program.
-
-Files: ./configure
-Copyright: 2003 Free Software Foundation, Inc.
-License: other
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-Files: ./debian/*
-Copyright: 2008 Ferenc Wágner <wferi at niif.hu>
-           2008, 2009 Russ Allbery <rra at debian.org>
-License: Expat
-
-Files: ./doxygen.{am,m4}
-Copyright: 2004 Oren Ben-Kiki
-License: other
- This file is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
+ 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.
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-Files: ./install-sh
-Copyright: (C) 1994 X Consortium
-License: Expat
+ 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.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
@@ -138,19 +171,3 @@ License: Expat
  CLAIM, DAMAGES OR OTHER 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 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 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

More information about the Pkg-shibboleth-devel mailing list