[Pkg-gnupg-commit] r232 - in /gnupg/trunk/debian: changelog source.lintian-overrides

[thijs at users.alioth.debian.org]

Author: thijs
Date: Mon Apr  9 16:44:58 2012
New Revision: 232

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=232
Log:
* Add lintian override for gnupg-curl non-conflict.

Added:
    gnupg/trunk/debian/source.lintian-overrides
Modified:
    gnupg/trunk/debian/changelog

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=232&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Mon Apr  9 16:44:58 2012
@@ -1,8 +1,9 @@
 gnupg (1.4.12-5) UNRELEASED; urgency=low
 
   * Build udebs with --enable-minimal.
-
- -- Thijs Kinkhorst <thijs at debian.org>  Mon, 09 Apr 2012 15:53:21 +0000
+  * Add lintian override for gnupg-curl non-conflict.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 09 Apr 2012 18:44:33 +0200
 
 gnupg (1.4.12-4) unstable; urgency=low
 

Added: gnupg/trunk/debian/source.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/source.lintian-overrides?rev=232&op=file
==============================================================================
--- gnupg/trunk/debian/source.lintian-overrides (added)
+++ gnupg/trunk/debian/source.lintian-overrides Mon Apr  9 16:44:58 2012
@@ -1,0 +1,2 @@
+gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg/gpgkeys_curl
+gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg/gpgkeys_hkp