diff -u gnupg-1.4.9/debian/changelog gnupg-1.4.9/debian/changelog --- gnupg-1.4.9/debian/changelog +++ gnupg-1.4.9/debian/changelog @@ -1,3 +1,10 @@ +gnupg (1.4.9-4ubuntu3) karmic; urgency=low + + * deian/patches/100_ubuntu_default_keyserver.dpatch: (LP: #380093) + - Add keyserver.ubuntu.com as a default keyserver in g10/options.skel + + -- Mackenzie Morgan Mon, 25 May 2009 13:10:51 -0400 + gnupg (1.4.9-4ubuntu2) karmic; urgency=low * debian/rules: add --enable-noexecstack to configure to avoid needless diff -u gnupg-1.4.9/debian/patches/00list gnupg-1.4.9/debian/patches/00list --- gnupg-1.4.9/debian/patches/00list +++ gnupg-1.4.9/debian/patches/00list @@ -8,0 +9 @@ +100_ubuntu_default_keyserver only in patch2: unchanged: --- gnupg-1.4.9.orig/debian/patches/100_ubuntu_default_keyserver.dpatch +++ gnupg-1.4.9/debian/patches/100_ubuntu_default_keyserver.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_ubuntu_default_keyserver.dpatch by Mackenzie Morgan +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnupg-1.4.9~/g10/options.skel gnupg-1.4.9/g10/options.skel +--- gnupg-1.4.9~/g10/options.skel 2009-05-25 13:07:50.643227778 -0400 ++++ gnupg-1.4.9/g10/options.skel 2009-05-25 13:08:09.682237626 -0400 +@@ -118,6 +118,7 @@ + keyserver hkp://keys.gnupg.net + #keyserver mailto:pgp-public-keys@keys.nl.pgp.net + #keyserver ldap://keyserver.pgp.com ++keyserver hkp://keyserver.ubuntu.com + + # Common options for keyserver functions: + #