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

Russ Allbery rra at debian.org
Fri May 31 00:48:00 UTC 2013


The following commit has been merged in the master branch:
commit 97d08dad30c15a1a45b532a6f98f64cb7187e5b7
Author: Russ Allbery <rra at debian.org>
Date:   Thu May 30 16:43:28 2013 -0700

    Install RELEASE.txt as the upstream changelog
    
    * Install the upstream doc/RELEASE.txt file as the upstream changelog.
      It's not exactly a changelog, but it has pointers to the upstream web
      documentation of changes, which is probably what people are looking for.

diff --git a/debian/changelog b/debian/changelog
index 00b36ae..1a13afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ shibboleth-sp2 (2.5.1+dfsg-1) UNRELEASED; urgency=low
     on threshold.  The previous version of the file referenced a
     commented-out warn_log destination, which caused errors to be spammed
     to syslog.
+  * Install the upstream doc/RELEASE.txt file as the upstream changelog.
+    It's not exactly a changelog, but it has pointers to the upstream web
+    documentation of changes, which is probably what people are looking for.
   * Switch repackaged upstream source to xz compression.
 
  -- Russ Allbery <rra at debian.org>  Sat, 03 Nov 2012 10:27:33 -0700
diff --git a/debian/libapache2-mod-shib2.docs b/debian/libapache2-mod-shib2.docs
index ad0e7d1..9ae799f 100644
--- a/debian/libapache2-mod-shib2.docs
+++ b/debian/libapache2-mod-shib2.docs
@@ -1,3 +1,2 @@
 doc/CREDITS.txt
 doc/README.txt
-doc/RELEASE.txt
diff --git a/debian/libshibsp-doc.docs b/debian/libshibsp-doc.docs
index ad0e7d1..9ae799f 100644
--- a/debian/libshibsp-doc.docs
+++ b/debian/libshibsp-doc.docs
@@ -1,3 +1,2 @@
 doc/CREDITS.txt
 doc/README.txt
-doc/RELEASE.txt
diff --git a/debian/rules b/debian/rules
index 2d52877..7134ef8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,9 @@ override_dh_install:
 	    debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
 	dh_install -s -i --fail-missing
 
+override_dh_installchangelogs:
+	dh_installchangelogs doc/RELEASE.txt
+
 override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt
 	set -e; if [ -d "$(DOCS)" ] ; then \

-- 
Debian packaging for the 2.0 Apache Shibboleth SP



More information about the Pkg-shibboleth-devel mailing list