Merge Chris Glass's branch to fix manifest generation in OVA files.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.439) UNRELEASED; urgency=medium
+
+  * Fix the manifest generation in OVA files so that ovf files don't have
+    double extensions.  Thanks to Chris Glass.  (LP: #1627931)
+
+ -- Brian Murray <brian@ubuntu.com>  Fri, 03 Feb 2017 13:30:57 -0800
+
 livecd-rootfs (2.438) zesty; urgency=medium
 
   * live-build/auto/config: Add ubuntu-budgie project (LP: #1652144)

live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary

@@ -67,7 +67,7 @@ ovf_sha256=$(sha256sum ${ovf} | cut -d' ' -f1)
 manifest="${scratch_d}/${prefix}.mf"
 cat > "${manifest}" <<EOF
 SHA256(${vmdk_f##*/})= ${vmdk_sha256}
-SHA256(${ovf##*/}.ovf)= ${ovf_sha256}
+SHA256(${ovf##*/})= ${ovf_sha256}
 EOF
 
 # Now create the OVA

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -181,7 +181,7 @@ manifest="${box_d}/${prefix}.mf"
 cat > "${manifest}" <<EOF
 SHA256(${vmdk_f##*/})= ${vmdk_sha256}
 SHA256(${cdrom_vmdk_f##*/})= ${cdrom_sha256}
-SHA256(${ovf##*/}.ovf)= ${ovf_sha256}
+SHA256(${ovf##*/})= ${ovf_sha256}
 EOF
 
 # Now create the box