Merge branch 'pu/bump-abi6' into 'master'

Bump ABI to 6.0

See merge request apt-team/apt!103

1 files changed, 1 insertions, 12 deletions

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index dad50c564..e2a9927ef 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -13,12 +13,10 @@
 #define APTPKG_HASHES_H
 
 #include <apt-pkg/macros.h>
-#include <apt-pkg/md5.h>
-#include <apt-pkg/sha1.h>
-#include <apt-pkg/sha2.h>
 
 #include <cstring>
 #include <string>
+#include <vector>
 
 
 
@@ -171,15 +169,6 @@ class PrivateHashes;
 class Hashes
 {
    PrivateHashes * const d;
-APT_IGNORE_DEPRECATED_PUSH
-   /* TODO: those will disappear in the future as it is hard to add new ones this way.
-    * Use Add* to build the results and get them via GetHashStringList() instead */
-   MD5Summation MD5 APT_PKG_590("Remove");
-   SHA1Summation SHA1 APT_PKG_590("Remove");
-   SHA256Summation SHA256 APT_PKG_590("Remove");
-   SHA512Summation SHA512 APT_PKG_590("Remove");
-APT_IGNORE_DEPRECATED_POP
-
    public:
    static const int UntilEOF = 0;