From 26909642e9b4b01f59c80a9933ed98a15f8184bf Mon Sep 17 00:00:00 2001
From: Brian Murray <brian@ubuntu.com>
Date: Fri, 3 Feb 2017 13:32:59 -0800
Subject: [PATCH] Import patches-unapplied version 2.439 to
 ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 14664922352854a44243d2cd9c81c9c0d62f1c5e

New changelog entries:
  * Fix the manifest generation in OVA files so that ovf files don't have
    double extensions.  Thanks to Chris Glass.  (LP: #1627931)
---
 debian/changelog                                      | 7 +++++++
 live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary | 2 +-
 live-build/ubuntu-cpc/hooks/042-vagrant.binary        | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3f32ef4..bdfced4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.439) zesty; 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:32:59 -0800
+
 livecd-rootfs (2.438) zesty; urgency=medium
 
   * live-build/auto/config: Add ubuntu-budgie project (LP: #1652144)
diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
index b7c21474..3b50a268 100755
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/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
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index ca08e44e..aa524a09 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/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