--- virt-goodies-0.4.orig/vmware2libvirt
+++ virt-goodies-0.4/vmware2libvirt
@@ -108,13 +108,16 @@
     ide_disk = ""
     disk = ""
     try:
-         scsi_disk = get_vmx_value(vmx, "scsi0:0.fileName")
+        scsi_disk = get_vmx_value(vmx, "scsi0:0.fileName")
     except:
-         pass
+        pass
     try:
-         ide_disk = get_vmx_value(vmx, "ide0:0.fileName")
+        ide_disk = get_vmx_value(vmx, "ide0:0.fileName")
     except:
-         pass
+        try:
+            ide_disk = get_vmx_value(vmx, "ide0:0.filename")
+        except:
+            pass
 
     if scsi_disk != "" and ide_disk != "":
         # found two disks, default to scsi for now
--- virt-goodies-0.4.orig/debian/changelog
+++ virt-goodies-0.4/debian/changelog
@@ -1,3 +1,26 @@
+virt-goodies (0.4-2) unstable; urgency=low
+
+  * vmware2libvirt: allow for ide0:0.filename (used by easyvmx). Patch
+    based on work by Ang Way Chuang (Closes: #609039).  Patch from
+    Ubuntu and Jamie Strandboge.
+  * Add recommend on munin-libvirt-plugins (Closes: #611206).
+  * Update Standards-Version from 3.8.4 to 3.9.4.  No changes needed.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sun, 13 Jan 2013 18:23:01 +0100
+
+virt-goodies (0.4-1) unstable; urgency=low
+
+  * New upstream version.
+    - Drop patch vmware2libvirt-quotes.diff, now fixed upstream.
+  * Drop patch system from build, it is no longer used.
+  * Remaining changes:
+    - Add dependency on uuid-runtime, needed by vmware2libvirt. 
+    - Remove 'more to come' comment from package description.  Nothing
+      have shown up in two years, so it seem a bit misplaced.
+    - Update standards-version from 3.7.3 to 3.8.4.  No change needed.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 17 Mar 2010 14:08:26 +0100
+
 virt-goodies (0.4) lucid; urgency=low
 
   * Properly unquote strings when vmx file uses DOS linefeeds. (LP: #246841)
@@ -7,6 +30,19 @@
 
  -- Soren Hansen <soren@ubuntu.com>  Mon, 08 Mar 2010 20:49:34 +0100
 
+virt-goodies (0.3-1) unstable; urgency=low
+
+  * Initial upload based on the package in Ubuntu (Closes: #570216).
+  * Add dependency on uuid-runtime, needed by vmware2libvirt. 
+  * Remove 'more to come' comment from package description.  Nothing
+    have shown up in two years, so it seem a bit misplaced.
+  * Update standards-version from 3.7.3 to 3.8.4.  No change needed.
+  * Build-depend on quilt and modify rules to apply patches.
+  * New patch vmware2libvirt-quotes.diff solving a parse error with
+    vmware files generated on Windows.
+
+ -- Petter Reinholdtsen <pere@debian.org>  Wed, 17 Feb 2010 23:37:37 +0100
+
 virt-goodies (0.3) intrepid; urgency=low
 
   * Add support for multiple NIC's.
--- virt-goodies-0.4.orig/debian/control
+++ virt-goodies-0.4/debian/control
@@ -1,21 +1,19 @@
 Source: virt-goodies
 Section: admin
 Priority: extra
-Maintainer: Soren Hansen <soren@ubuntu.com>
+Maintainer: Petter Reinholdtsen <pere@debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Standards-Version: 3.7.3
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/virt-goodies
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk
 Vcs-Browser: http://codebrowse.launchpad.net/~ubuntu-virt/virt-goodies/trunk
 
 Package: virt-goodies
 Architecture: all
-Depends: ${misc:Depends}, python-libvirt, libvirt-bin, python
-Recommends: munin-node
+Depends: ${misc:Depends}, python-libvirt, libvirt-bin, python, uuid-runtime
+Recommends: munin-node, munin-libvirt-plugins
 Description: A collection of helpful virtualisation related tools
  Included tools are:
  .
   * A libvirt munin plugin.
   * A script to convert VMWare Workstation and Server VM's to kvm/libvirt ones.
- .
- More to come.