Merge ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:eoan-apt-fix into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Andreas Hasenack]

apt-hook: Add missing headers for APT 1.9

APT 1.9 cleans up the APT headers ever so slightly, so we need to include a few more.

PPA with test build: https://launchpad.net/~ahasenack/+archive/ubuntu/ua-apt-fix

This is needed to help unblock the APT 1.9 transition in eoan:

https://people.canonical.com/~ubuntu-archive/transitions/html/apt.html

[Paride Legovini (paride)]

Looks good!

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks Paride!

[Andreas Hasenack (ahasenack)]

Tagged and uploaded.

diff --git a/apt-hook/hook.cc b/apt-hook/hook.cc
index eb1583e..b5b3462 100644
--- a/apt-hook/hook.cc
+++ b/apt-hook/hook.cc
@@ -19,6 +19,8 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/policy.h>
 #include <apt-pkg/strutl.h>
 
 #include <fstream>
diff --git a/debian/changelog b/debian/changelog
index 2a97999..88d1f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-advantage-tools (19.4.1) eoan; urgency=medium
+
+  * apt-hook: Add missing headers for APT 1.9
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 18 Jun 2019 18:21:19 -0300
+
 ubuntu-advantage-tools (19.4) disco; urgency=medium
 
   * Drop the self-test assert in the apt-hook, it's making the subiquity