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

[Russ Allbery]

The following commit has been merged in the master branch:
commit 05f5392f00e31bacaf12d231075c90def7656c7c
Author: Russ Allbery <rra at debian.org>
Date:   Wed Apr 6 21:34:36 2011 -0700

    Change to Debian source format 3.0 (quilt)
    
    * Change to Debian source format 3.0 (quilt).  Force a single Debian
      patch for simplicity since the packaging is maintained in Git using
      branches, and include a patch header explaining why.

diff --git a/debian/changelog b/debian/changelog
index f5dc2e6..d52d461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ shibboleth-sp2 (2.4.2+dfsg-1) UNRELEASED; urgency=low
   * Update to debhelper compatibility level V8.
     - Use debhelper rule minimization.
   * Update debian/copyright to the current DEP-5 specification.
+  * Change to Debian source format 3.0 (quilt).  Force a single Debian
+    patch for simplicity since the packaging is maintained in Git using
+    branches, and include a patch header explaining why.
 
  -- Russ Allbery <rra at debian.org>  Mon, 29 Nov 2010 15:54:07 -0800
 
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..7423a2d
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+single-debian-patch
diff --git a/debian/source/patch-header b/debian/source/patch-header
new file mode 100644
index 0000000..33c7800
--- /dev/null
+++ b/debian/source/patch-header
@@ -0,0 +1,10 @@
+Subject: Collected Debian patches for shibboleth-sp2
+Author: Russ Allbery <rra at debian.org>
+
+The packaging for shibboleth-sp2 is maintained in Git using multiple
+branches for fixes, which makes it complex to separate the changes
+into individual patches.  They are therefore all included in a single
+Debian patch.
+
+For full commit history and separated commits, see the packaging Git
+repository.

-- 
Debian packaging for the 2.0 Apache Shibboleth SP