[apache2] 01/01: Add PGP support to Apache's watch file. Thanks dkg for the pointers

[Arno Töll]

This is an automated email from the git hooks/post-receive script.

atoell-guest pushed a commit to branch master
in repository apache2.

commit f134477e7b2b9986e0932dd97d2df7e3fb69d0cf
Author: Arno Töll <arno at debian.org>
Date:   Mon Dec 23 12:51:20 2013 +0100

    Add PGP support to Apache's watch file. Thanks dkg for the pointers
---
 debian/changelog                |   5 +++--
 debian/source/include-binaries  |   1 +
 debian/upstream-signing-key.pgp | Bin 0 -> 336877 bytes
 debian/watch                    |   2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9b62aa..814e627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,9 +36,10 @@ apache2 (2.4.6-4) UNRELEASED; urgency=low
     for all the work in the past.
   * Change the Default Document root directory where files are served from
     (Closes: #730372).
+  * Add GPG support to our watch file. Thanks to Daniel Kahn Gillmor
+    for this suggestion and for providing a patch (Closes: #732450)
 
-
- -- Arno Töll <arno at debian.org>  Sun, 24 Nov 2013 16:04:50 +0100
+ -- Arno Töll <arno at debian.org>  Mon, 23 Dec 2013 12:36:59 +0100
 
 apache2 (2.4.6-3) unstable; urgency=low
 
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index cfcd7ef..aa809ac 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -16,3 +16,4 @@ debian/icons/odf6odp-20x22.png
 debian/icons/odf6otp-20x22.png
 debian/icons/odf6oth-20x22.png
 debian/icons/openlogo-75.png
+debian/upstream-signing-key.pgp
diff --git a/debian/upstream-signing-key.pgp b/debian/upstream-signing-key.pgp
new file mode 100644
index 0000000..adf18bd
Binary files /dev/null and b/debian/upstream-signing-key.pgp differ
diff --git a/debian/watch b/debian/watch
index 38960de..d2265b8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.apache.org/dist/httpd/httpd-(\d\.[02468]\.\d+)\.tar\.gz
+opts=pgpsigurlmangle=s/$/.asc/ http://www.apache.org/dist/httpd/httpd-(\d\.[02468]\.\d+)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git