diff -u gnupg-1.4.6/debian/changelog gnupg-1.4.6/debian/changelog
--- gnupg-1.4.6/debian/changelog
+++ gnupg-1.4.6/debian/changelog
@@ -1,3 +1,10 @@
+gnupg (1.4.6-2ubuntu4) gutsy; urgency=low
+
+  * debian/patches/70_trust_error.dpatch: Removed as it broke setting the
+    trust level to 1 (LP: #147343).
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 01 Oct 2007 21:52:52 +0200
+
 gnupg (1.4.6-2ubuntu3) gutsy; urgency=low
 
   [ Scott Kitterman ]
diff -u gnupg-1.4.6/debian/patches/00list gnupg-1.4.6/debian/patches/00list
--- gnupg-1.4.6/debian/patches/00list
+++ gnupg-1.4.6/debian/patches/00list
@@ -9 +8,0 @@
-70_trust_error
reverted:
--- gnupg-1.4.6/debian/patches/70_trust_error.dpatch
+++ gnupg-1.4.6.orig/debian/patches/70_trust_error.dpatch
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_trust_error.dpatch by  <scott@kitterman.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't allow inavlid trust response. (LP: #39459)
-
-@DPATCH@
-diff -urNad gnupg-1.4.6~/g10/pkclist.c gnupg-1.4.6/g10/pkclist.c
---- gnupg-1.4.6~/g10/pkclist.c	2006-07-26 06:31:15.000000000 -0400
-+++ gnupg-1.4.6/g10/pkclist.c	2007-07-06 11:06:15.000000000 -0400
-@@ -303,7 +303,7 @@
-       did_help = 0;
-     else if( *p && p[1] )
-       ;
--    else if( !p[1] && ((*p >= '0'+min_num) && *p <= (mode?'5':'4')) ) 
-+    else if( !p[1] && ((*p > '0'+min_num) && *p <= (mode?'5':'4')) ) 
-       {
-         unsigned int trust;
-         switch( *p )