[SCM] Debian packaging for Shibboleth IdP 2.x branch, master, updated. debian/2.1.5-1-2-g12dfd28

[Russ Allbery]

The following commit has been merged in the master branch:
commit e1c382300595f244154cea807210484487b0b673
Author: Russ Allbery <rra at stanford.edu>
Date:   Thu Aug 19 14:09:27 2010 -0700

    Rename the package to shibboleth-idp2
    
    * Rename the package to shibboleth-idp2 in case it's useful (and
      possible) for both IdP packages to be coinstallable.

diff --git a/debian/changelog b/debian/changelog
index bced282..9b24241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-shibboleth-idp (2.1.5-1) unstable; urgency=low
+shibboleth-idp2 (2.1.5-1) unstable; urgency=low
 
+  [ Faidon Liambotis ]
   * New major upstream release.
 
+  [ Russ Allbery ]
+  * Rename the package to shibboleth-idp2 in case it's useful (and
+    possible) for both IdP packages to be coinstallable.
+
  -- Faidon Liambotis <paravoid at debian.org>  Wed, 18 Aug 2010 22:45:52 +0300
 
 shibboleth-idp (1.3.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7cdd1e1..f037d77 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
-Source: shibboleth-idp
+Source: shibboleth-idp2
 Section: net
 Priority: optional
 Maintainer: Faidon Liambotis <paravoid at debian.org>
 Build-Depends: debhelper (>= 7.0.50)
 Standards-Version: 3.9.1
 
-Package: shibboleth-idp
+Package: shibboleth-idp2
 Architecture: all
 Depends: ${misc:Depends}, tomcat6, java-wrappers
 Description: Shibboleth Identity Provier
diff --git a/debian/rules b/debian/rules
index 338167e..4daffeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 override_dh_install:
 	dh_install
 	# not needed at runtime; produces tomcat errors
-	-rm -f debian/shibboleth-idp/usr/share/shibboleth-idp/WEB-INF/lib/servlet-api-*.jar
+	-rm -f debian/shibboleth-idp2/usr/share/shibboleth-idp/WEB-INF/lib/servlet-api-*.jar
 	# use sed to replace ant variables
 	# we could also write our own build.xml but this is easier :)
 	sed -i \
@@ -20,12 +20,12 @@ override_dh_install:
 		-e 's;\$$IDP_ENTITY_ID\$$;https://idp.example.org/idp/shibboleth;g' \
 		-e 's;\$$IDP_SCOPE\$$;example.org;g' \
 		-e '/\$$IDP_CERTIFICATE\$$/d' \
-		debian/shibboleth-idp/etc/shibboleth-idp/*
+		debian/shibboleth-idp2/etc/shibboleth-idp/*
 	# web.xml needs file:, for some peculiar reason
 	sed -i -e 's;\$$IDP_HOME\$$/conf/;file:/etc/shibboleth-idp/;g' \
-		debian/shibboleth-idp/usr/share/shibboleth-idp/WEB-INF/web.xml
+		debian/shibboleth-idp2/usr/share/shibboleth-idp/WEB-INF/web.xml
 	# move web.xml to /etc and symlink it
-	mv debian/shibboleth-idp/usr/share/shibboleth-idp/WEB-INF/web.xml \
-		debian/shibboleth-idp/etc/shibboleth-idp/web.xml
+	mv debian/shibboleth-idp2/usr/share/shibboleth-idp/WEB-INF/web.xml \
+		debian/shibboleth-idp2/etc/shibboleth-idp/web.xml
 	ln -s /etc/shibboleth-idp/web.xml \
-		debian/shibboleth-idp/usr/share/shibboleth-idp/WEB-INF/web.xml
+		debian/shibboleth-idp2/usr/share/shibboleth-idp/WEB-INF/web.xml

-- 
Debian packaging for Shibboleth IdP 2.x