[SCM] Debian packaging for XMLTooling-C branch, master, updated. debian/1.3.3-2-17-g716022d

Russ Allbery rra at debian.org
Mon Mar 14 03:58:35 UTC 2011


The following commit has been merged in the master branch:
commit 2bd59b1db98d83381681e2f1b04f478ef555601e
Author: Russ Allbery <rra at debian.org>
Date:   Sun Mar 13 18:19:34 2011 -0700

    Update debian/copyright for upstream release, DEP-5
    
    * Update debian/copyright to the current DEP-5 specification.
    
    Update file paths and copyright dates for the new upstream release.

diff --git a/debian/changelog b/debian/changelog
index 59755c0..dfba7d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xmltooling (1.4.1-1) UNRELEASED; urgency=low
     - Improve handling of simple content when comments are present
   * Force build dependency on xml-security-c 1.6 or later for consistent
     build results.
+  * Update debian/copyright to the current DEP-5 specification.
 
  -- Russ Allbery <rra at debian.org>  Sun, 13 Mar 2011 17:55:12 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 6cf467d..0d1e8dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,18 @@
-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/opensaml/cpp/2.0/
+Format-Specification:
+ http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Source: http://shibboleth.internet2.edu/downloads/opensaml/cpp/
+Upstream-Name: XMLTooling
 
 Files: *
-Copyright: 2001-2009 Internet2
+Copyright: 2001-2010 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
+ 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.
@@ -24,10 +22,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
- 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.
@@ -37,40 +36,12 @@ License: other
  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE.
 
-Files: ./acx_pthread.m4
-Copyright: 2006 Steven G. Johnson <stevenj at alum.mit.edu>
-License: GPL-2+ | other
- 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
- 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, the respective Autoconf Macro's copyright owner
- gives unlimited permission to copy, distribute and modify the configure
- scripts that are the output of Autoconf when processing the Macro. You
- need not follow the terms of the GNU General Public License when using or
- distributing such scripts, even though portions of the text of the Macro
- appear in them. The GNU General Public License (GPL) does govern all
- other use of the material that constitutes the Autoconf Macro.
- .
- This special exception to the GPL applies to versions of the Autoconf
- Macro released by the Autoconf Macro Archive. When you make and
- 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
+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 Free Software Foundation, Inc.
-License: GPL-2+ | other
+ 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
@@ -89,49 +60,93 @@ License: GPL-2+ | other
  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
+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: 992, 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/*
+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}
+Files: doxygen.am m4/doxygen.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.
+License: FSF-unlimited
 
-Files: ./install-sh
-Copyright: (C) 1994 X Consortium
-License: Expat
+Files: m4/acx_pthread.m4 m4/ax_create_pkgconfig_info.m4
+Copyright: 2006 Steven G. Johnson <stevenj at alum.mit.edu>
+ 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
+ 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, the respective Autoconf Macro's copyright owner
+ gives unlimited permission to copy, distribute and modify the configure
+ scripts that are the output of Autoconf when processing the Macro. You
+ need not follow the terms of the GNU General Public License when using or
+ distributing such scripts, even though portions of the text of the Macro
+ appear in them. The GNU General Public License (GPL) does govern all
+ other use of the material that constitutes the Autoconf Macro.
+ .
+ This special exception to the GPL applies to versions of the Autoconf
+ Macro released by the Autoconf Macro Archive. When you make and
+ 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: ./schemas/soap-envelope.xsd
+Files: schemas/soap-envelope.xsd
 Copyright: 2001 Martin Gudgin, Developmentor
  2001 W3C (Massachusetts Institute of Technology, Institut National de
  Recherche en Informatique et en Automatique, Keio University) All Rights
  Reserved. http://www.w3.org/Consortium/Legal/
 License: W3C-Software
 
-Files: ./schemas/xml.xsd, ./schemas/xmldsig-core-schema.xsd
+Files: schemas/xml.xsd schemas/xmldsig-core-schema.xsd
 Copyright: 2001 W3C (Massachusetts Institute of Technology, Institut
  National de Recherche en Informatique et en Automatique, Keio University)
  All Rights Reserved. http://www.w3.org/Consortium/Legal/
 License: W3C-Software
 
-Files: ./xmltooling/security/*X509CRL.h,
- ./xmltooling/security/impl/*X509CRL.cpp, ./xmltooling/util/Curl*
-Copyright: 1999-2007 The Apache Software Foundation
+Files: xmltooling/security/*X509CRL.h
+ xmltooling/security/impl/*X509CRL.cpp xmltooling/util/Curl*
+Copyright: 1999-2010 The Apache Software Foundation
 License: Apache-2.0
 
 License: Apache-2.0

-- 
Debian packaging for XMLTooling-C



More information about the Pkg-shibboleth-devel mailing list