Merge branch 'upstream'

[pkg/t-prot.git] / contrib / t-prot-r1.222-gpg126.diff

diff --git a/contrib/t-prot-r1.222-gpg126.diff b/contrib/t-prot-r1.222-gpg126.diff
deleted file mode 100644 (file)
index 1d05254..0000000
--- a/contrib/t-prot-r1.222-gpg126.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- t-prot     Mon Feb 14 15:17:19 2005
-+++ t-prot-G126        Mon Feb 14 15:15:30 2005
-@@ -972,16 +972,16 @@
-                 Locale::gettext::gettext("Can't check signature: %s\n") =~
-                 m/^([^%]*)/o;
-             ($gpg_aka) =
--                Locale::gettext::gettext((' 'x16).'aka "%s"') =~
-+                Locale::gettext::gettext((' 'x16).'aka "') =~
-                 m/^(.*?)"/o;
-             ($gpg_bad) =
--                Locale::gettext::gettext('BAD signature from "%s"') =~
-+                Locale::gettext::gettext('BAD signature from "') =~
-                 m/^(.*?)"/o;
-             ($gpg_expired) =
-                 Locale::gettext::gettext("Note: This key has expired!\n") =~
-                 m/^(.*?)\n/mo;
-             ($gpg_good) =
--                Locale::gettext::gettext('Good signature from "%s"') =~
-+                Locale::gettext::gettext('Good signature from "') =~
-                 m/^(.*?)"/o;
-             ($gpg_bug) =
-                 Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~