[Pkg-gnupg-commit] [gnupg2] 01/01: avoid shipping Changelog-2011, use upstream ChangeLog (Closes: #803225)

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit b425ad49f9ef00458c546b8dc48887476d2b3ec1
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Oct 28 12:45:51 2015 -0400

    avoid shipping Changelog-2011, use upstream ChangeLog (Closes: #803225)
---
 debian/changelog |  2 ++
 debian/rules     | 15 ---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fec98a5..79a869d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gnupg2 (2.1.9-2) UNRELEASED; urgency=medium
 
   * ship sks-keyservers.netCA.pem in dirmngr to make it easier to use hkps.
+  * avoid shipping Changelog-2011, use upstream ChangeLog (Closes:
+    #803225)
 
  -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 19 Oct 2015 23:51:17 -0400
 
diff --git a/debian/rules b/debian/rules
index 030624b..70dcc70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,21 +38,6 @@ override_dh_auto_install:
 	install -m 644 debian/gnupg-agent.xsession \
 		debian/gnupg-agent/etc/X11/Xsession.d/90gpg-agent
 
-override_dh_installchangelogs:
-	dh_installchangelogs -pgnupg-agent agent/ChangeLog-2011
-	dh_installchangelogs -pgpgsm sm/ChangeLog-2011
-	dh_installchangelogs -pscdaemon scd/ChangeLog-2011
-	dh_installchangelogs -pgnupg2 ChangeLog
-	dh_installchangelogs -pgnupg2-dbg ChangeLog
-	dh_installchangelogs -pgpgv2 ChangeLog
-	dh_installchangelogs -pdirmngr dirmngr/ChangeLog-2011
-
-# Install subdirectory changelogs.
-	for i in \
-		$(foreach dir,doc g10 tools,$(dir)/ChangeLog-2011); \
-		do install -m 644 $$i \
-			debian/gnupg2/usr/share/doc/gnupg2/changelog.$$(dirname $$i); done
-
 override_dh_installman:
 	help2man --no-info -n "List, export, import Keybox data" \
 		debian/tmp/usr/bin/kbxutil > debian/kbxutil.1

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