[SCM] Debian packaging for OpenSAML 2.0 branch, debian, updated. debian/2.0-1-17-gb48c9d6

[Ferenc Wagner]

The following commit has been merged in the debian branch:
commit b48c9d6d4fedff65571f6b8d00cf4259a43fb6c0
Author: Ferenc Wagner <wferi at niif.hu>
Date:   Mon Jun 16 12:24:37 2008 +0200

    Don't pass --sourcedir=debian/tmp to dh_install
    
    At the same time install the API documentation from the build area
    since we delete the doc portion of the install area for simplicity reasons.

diff --git a/debian/libsaml2-dev.install b/debian/libsaml2-dev.install
index b341905..90a4881 100644
--- a/debian/libsaml2-dev.install
+++ b/debian/libsaml2-dev.install
@@ -1,2 +1,2 @@
-usr/include/*
-usr/lib/lib*.so
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.so
diff --git a/debian/libsaml2-doc.install b/debian/libsaml2-doc.install
index e4f3551..2a35a1e 100644
--- a/debian/libsaml2-doc.install
+++ b/debian/libsaml2-doc.install
@@ -1 +1 @@
-usr/share/doc/opensaml/api/* usr/share/doc/libsaml2-doc
+doc/api/* usr/share/doc/libsaml2-doc
diff --git a/debian/libsaml2.install b/debian/libsaml2.install
index d370c2b..72835f7 100644
--- a/debian/libsaml2.install
+++ b/debian/libsaml2.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/bin/*
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/bin/*
diff --git a/debian/opensaml2-schemas.install b/debian/opensaml2-schemas.install
index 87acbc8..57392dd 100644
--- a/debian/opensaml2-schemas.install
+++ b/debian/opensaml2-schemas.install
@@ -1 +1 @@
-usr/share/xml/opensaml2
+debian/tmp/usr/share/xml/opensaml2
diff --git a/debian/rules b/debian/rules
index a662f2a..7b0cdfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,8 +61,8 @@ install-stamp:
 	dh_testroot
 	dh_clean -k
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	rm $(CURDIR)/debian/tmp/usr/share/doc/opensaml/{LOG4CPP.LICENSE,{LICENSE,NOTICE}.txt}
-	dh_install -s -i --fail-missing --sourcedir=debian/tmp
+	rm -r $(CURDIR)/debian/tmp/usr/share/doc/opensaml
+	dh_install -s -i --fail-missing
 	touch $@
 
 binary: binary-arch binary-indep

-- 
Debian packaging for OpenSAML 2.0