[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-1-5-ga4e5882

[Russ Allbery]

The following commit has been merged in the master branch:
commit a4e588216e10c908e719a31b6e6f192fc05d054c
Author: Russ Allbery <rra at debian.org>
Date:   Sun Sep 25 14:44:31 2011 -0700

    Fix some formatting issues in debian/copyright caught by Lintian

diff --git a/debian/changelog b/debian/changelog
index 47b523c..6e16661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ shibboleth-sp2 (2.4.3+dfsg-2) unstable; urgency=low
     current log4cpp does indeed do the facility shift.  Thanks to Jeremy
     Maryott for the report.  (Closes: #638594)
   * Update the upstream download location in debian/copyright.
+  * Fix some formatting issues in debian/copyright caught by Lintian.
 
- -- Russ Allbery <rra at debian.org>  Sun, 25 Sep 2011 14:33:49 -0700
+ -- Russ Allbery <rra at debian.org>  Sun, 25 Sep 2011 14:44:15 -0700
 
 shibboleth-sp2 (2.4.3+dfsg-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 8aec989..9d53eff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,4 @@
-Format-Specification:
- http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
 Source: http://www.shibboleth.net/downloads/service-provider/
 Comment: The original upstream source was repackaged to remove the
  WS-Trust.xsd schema, which was not distributed under a DFSG-free
@@ -16,28 +15,12 @@ Copyright: 2001-2011 University Corporation for Advanced Internet
  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.
- .
- 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: 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.
- .
- 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: build-aux/config.guess build-aux/config.sub build-aux/depcomp
  build-aux/missing
@@ -157,6 +140,15 @@ License: Apache-2.0
  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: 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.
+ .
+ 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: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the

-- 
Debian packaging for the 2.0 Apache Shibboleth SP