changelog: Incorporate changelog changes from Hans's pre.20180911.

The changes in Hans's version are all in my tree now: I've rebased
onto his .dfsg upstream tag, and the my own tree already had the
lintian override.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --git a/debian/changelog b/debian/changelog
index 211d21a70eb4a833642b5153e71f7ef41c4f8a02..79bdae90ceda85490baff92e605dbe10c92d32ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xen (4.11.1~pre.20180911.5acdd26fdc+dfsg-1) UNRELEASED; urgency=medium
+xen (4.11.1~pre.20180911.5acdd26fdc+dfsg-1) unstable; urgency=medium
 
-  * Update to new upstream version 4.11.1~pre.20180911.5acdd26fdc+dfsg.
+  * Update to new upstream version 4.11.1~pre.20180911.5acdd26fdc+dfsg;
+    merging in 4.11.1~pre.20180911.5acdd26fdc+dfsg-1~exp1.
 
  -- Ian Jackson <ian.jackson@citrix.com>  Fri, 05 Oct 2018 18:39:58 +0100
 
@@ -65,6 +66,16 @@ xen (4.11.1~pre+1.733450b39b-1) unstable; urgency=medium
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 03 Oct 2018 18:45:02 +0100
 
+xen (4.11.1~pre.20180911.5acdd26fdc+dfsg-1~exp1) experimental; urgency=medium
+
+  * Update to new upstream version 4.11.1~pre.20180911.5acdd26fdc+dfsg.
+  * Remove stubdom/grub.patches/00cvs from the upstream source because it's
+    not DFSG compliant. (license-problem-gfdl-invariants)
+  * Override statically-linked-binary lintian error about
+    usr/lib/xen-4.11/boot/xen-shim
+
+ -- Hans van Kranenburg <hans@knorrie.org>  Tue, 11 Sep 2018 15:34:34 +0200
+
 xen (4.11.1~pre+1.733450b39b-1~exp1) experimental; urgency=medium
 
   [ Hans van Kranenburg ]