merge with debian/experimental

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 3ad3e8d84ca7e6b83a7cb8d2ab0afab960b31fc7..251bcbc900071c88513fcc926a6f8a4feb32d47d 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,9 +1,10 @@
+#include <config.h>
+

 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>

-#include <apti18n.h>

 
 #include <utime.h>
 #include <stdio.h>
 
 #include <utime.h>
 #include <stdio.h>


@@ -12,9 +13,10 @@
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>

-

 #include <vector>
 
 #include <vector>
 

+#include <apti18n.h>
+

 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"