[SCM] Debian packaging for OpenSAML 2.0 branch, master, updated. debian/2.3-2-15-ge479aa0
Russ Allbery
rra at debian.org
Mon Apr 4 02:28:16 UTC 2011
The following commit has been merged in the master branch:
commit 5996cbe6ceee7e51fec59e46a3078ed703aaac9c
Author: Russ Allbery <rra at debian.org>
Date: Sun Apr 3 18:25:06 2011 -0700
Update debian/copyright
* Update debian/copyright to the current DEP-5 specification.
Also include changes for the new upstream release.
diff --git a/debian/changelog b/debian/changelog
index 5da0a2b..fa1d6cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ opensaml2 (2.4.1-1) UNRELEASED; urgency=low
- Duplication and line feed fixes for DiscoFeed.
- Fix reload interval backoff after reload failures
- Strip whitespace from SAMLRequest URL parameter values
+ * Update debian/copyright to the current DEP-5 specification.
-- Russ Allbery <rra at debian.org> Sun, 03 Apr 2011 17:59:57 -0700
diff --git a/debian/copyright b/debian/copyright
index 20c6a02..6f91216 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,17 @@
Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=409
-Upstream-Name: opensaml
-Upstream-Source:
- http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.1/
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: OpenSAML
+Source: http://shibboleth.internet2.edu/downloads/opensaml/cpp/latest/
Files: *
-Copyright: 2001-2009 Internet2
+Copyright: 2001-2010 Internet2
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.
Files: */Makefile.in
Copyright: 2001-2008 Internet2
- 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
-License: other
+ 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.
@@ -36,10 +21,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.
@@ -49,9 +35,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
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
@@ -78,39 +130,23 @@ 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 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.
+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
.
- 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.
+ http://www.apache.org/licenses/LICENSE-2.0
.
- The full text of the GNU General Public License version 2 is available on
- Debian systems in /usr/share/common-licenses/GPL-2.
+ 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.
.
- 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.
+ 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.
-Files: ./debian/*
-Copyright: 2008 Ferenc Wágner <wferi at niif.hu>
- 2008 Russ Allbery <rra at debian.org>
-License: other
+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
@@ -129,61 +165,3 @@ License: other
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.
-
-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.
- .
- 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: other
- 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 to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
- .
- FSF changes to this file are in the public domain.
-
-Files: ./saml/zlib/*
-Copyright: 1995-2005 Jean-loup Gailly and Mark Adler
-License: other
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
--
Debian packaging for OpenSAML 2.0
More information about the Pkg-shibboleth-devel
mailing list