finalise 4.8.0-1

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

diff --git a/debian/changelog b/debian/changelog
index 7e4096b3e16f1b1f102655046c7dbb93a2bf5db8..446ad31ce08c120bf722092859c8ae2f405583ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xen (4.8.0-1~) unstable; urgency=high
+xen (4.8.0-1) unstable; urgency=high
 
   * Update to upstream Xen 4.8.0.
     Includes the following security fixes:
@@ -13,25 +13,24 @@ xen (4.8.0-1~) unstable; urgency=high
     Includes other bugfixes too:
         Closes:#812166, Closes:#818525.
 
-  * Apply security fixes from upstream:
+  Cherry picks from upstream:
+  * Security fixes:
         XSA-204   CVE-2016-10013                 Closes:#848713
         XSA-203   CVE-2016-10025
         XSA-202   CVE-2016-10024
-
-  * For completeness, the following XSAs do not apply here:
+    For completeness, the following XSAs do not apply here:
         XSA-197   CVE-2016-9381      Bug is in qemu
         XSA-199   CVE-2016-9637      Bug is in qemu
         XSA-200   CVE-2016-9932      Xen 4.8 is not affected
+  * Cherry pick a build failure fix:
+      "x86/emul: add likely()/unlikely() to test harness"
 
+  [ Ian Jackson ]
   * Drop -lcrypto search from upstream configure, and from our
     Build-Depends.  Closes:#844419.
-
   * Change my own email address to my work (Citrix) address.  When
     uploading, I will swap hats to effectively sponsor my own upload.
 
-  * Cherry pick a build failure fix:
-      "x86/emul: add likely()/unlikely() to test harness"
-
   [ Ian Campbell ]
   * Start a qemu process in dom0 to service the toolstacks loopback disk
     attaches. (Closes: #770456)

diff --git a/debian/control.md5sum b/debian/control.md5sum
index 1bb5c69fbb305c3af5b4a1288e43da9772abb52a..807b049fbb524d0e20ecc3799258e23e607a993a 100644 (file)
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,4 +1,4 @@
-7ee2f2461f92ce180c488b8c2294bc76  debian/changelog
+0002423665720b40f608956bb04fc6fc  debian/changelog
 dc7b5d9f0538e3180af4e9aff9b0bd57  debian/bin/gencontrol.py
 20e336dbea44b1641802eff0dde9569b  debian/templates/control.main.in
 a15fa64ce6deead28d33c1581b14dba7  debian/templates/xen-hypervisor.postinst.in