[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.2.1+dfsg-133-g413ba5f

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 413ba5f34002540bae1bf6a34f38dda5624518d0
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Tue Nov 10 15:56:02 2009 -0800

    Run make install with NOKEYGEN=1
    
    * Run make install with NOKEYGEN=1 and stop rm-ing generated certificates.
      Fixes FTBFS.

diff --git a/debian/changelog b/debian/changelog
index 1242796..be8d675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ shibboleth-sp2 (2.3+dfsg-1) UNRELEASED; urgency=high
     require the versions with the security fix.
   * Fix watch file for the new version mangling.
 
+  [ Faidon Liambotis ]
+  * Run make install with NOKEYGEN=1 and stop rm-ing generated
+    certificates.  Fixes FTBFS.
+
   [ Ferenc Wagner ]
   * Run shibd as non-root.
 
diff --git a/debian/rules b/debian/rules
index b37a9dd..96419d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ install-stamp:
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) NOKEYGEN=1 DESTDIR=$(CURDIR)/debian/tmp install
 	rm -r $(CURDIR)/debian/tmp/usr/share/doc/shibboleth*
 	rm -r $(CURDIR)/debian/tmp/var/run
 	rm $(CURDIR)/debian/tmp/etc/shibboleth/*.dist
@@ -91,7 +91,6 @@ install-stamp:
 	rm $(CURDIR)/debian/tmp/etc/shibboleth/shibd-osx.plist
 	rm $(CURDIR)/debian/tmp/etc/shibboleth/shibd-redhat
 	rm $(CURDIR)/debian/tmp/etc/shibboleth/shibd-suse
-	rm $(CURDIR)/debian/tmp/etc/shibboleth/sp-*.pem
 	chmod +x $(CURDIR)/debian/tmp/etc/shibboleth/keygen.sh
 	mv $(CURDIR)/debian/tmp/etc/shibboleth/keygen.sh \
 	    $(CURDIR)/debian/tmp/usr/sbin/shib-keygen

-- 
Debian packaging for the 2.0 Apache Shibboleth SP