diff -Nru libguestfs-1.18.5/debian/changelog libguestfs-1.18.5/debian/changelog --- libguestfs-1.18.5/debian/changelog 2012-07-15 10:45:38.000000000 +0000 +++ libguestfs-1.18.5/debian/changelog 2013-01-16 10:36:40.000000000 +0000 @@ -1,3 +1,9 @@ +libguestfs (1:1.18.5-2ubuntu1) quantal-proposed; urgency=low + + * Install libguestfs supermin in the correct location. (LP: #1086974) + + -- Dmitrijs Ledkovs Wed, 16 Jan 2013 10:35:55 +0000 + libguestfs (1:1.18.5-2) unstable; urgency=low * [00d27da] Call dh_python2, dh_python3 with correct package name diff -Nru libguestfs-1.18.5/debian/control libguestfs-1.18.5/debian/control --- libguestfs-1.18.5/debian/control 2012-07-10 21:50:58.000000000 +0000 +++ libguestfs-1.18.5/debian/control 2013-01-16 10:37:43.000000000 +0000 @@ -1,9 +1,10 @@ Source: libguestfs Section: libs Priority: extra -Maintainer: Debian Libvirt Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Libvirt Maintainers Uploaders: Richard Jones , Guido Günther , Hilko Bengen -Build-Depends: debhelper (>= 9~), autotools-dev, aptitude, +Build-Depends: debhelper (>= 9~), autotools-dev, aptitude, dh-autoreconf, po-debconf, bash-completion, febootstrap (>= 3.2), libreadline-dev, libaugeas-dev, libselinux1-dev, libhivex-dev, libvirt-dev, diff -Nru libguestfs-1.18.5/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch libguestfs-1.18.5/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch --- libguestfs-1.18.5/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ libguestfs-1.18.5/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch 2013-01-16 10:33:44.000000000 +0000 @@ -0,0 +1,34 @@ +From: Hilko Bengen +Date: Thu, 19 Jul 2012 17:27:35 +0200 +Subject: Fix guestfs, supermin appliance path + +The supermin appliance files are not installed to the multiarch lib directory. +--- + appliance/Makefile.am | 4 ++-- + src/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/appliance/Makefile.am ++++ b/appliance/Makefile.am +@@ -29,8 +29,8 @@ + make.sh.in \ + packagelist.in + +-fsdir = $(libdir)/guestfs +-superminfsdir = $(libdir)/guestfs/supermin.d ++fsdir = $(prefix)/lib/guestfs ++superminfsdir = $(prefix)/lib/guestfs/supermin.d + + fs_DATA = + superminfs_DATA = \ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -161,7 +161,7 @@ + libguestfs_la_LIBADD += liberrnostring.la libprotocol.la + + libguestfs_la_CFLAGS = \ +- -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \ ++ -DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \ + -DGUESTFS_WARN_DEPRECATED=1 \ + $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \ + $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ diff -Nru libguestfs-1.18.5/debian/patches/series libguestfs-1.18.5/debian/patches/series --- libguestfs-1.18.5/debian/patches/series 2012-07-10 21:55:08.000000000 +0000 +++ libguestfs-1.18.5/debian/patches/series 2013-01-16 10:33:20.000000000 +0000 @@ -4,5 +4,5 @@ 0004-out-of-tree-build-fix-building-Perl-bindings.patch 0005-out-of-tree-build-daemon.patch 0006-ruby-install-to-vendor_ruby.patch -0007-autoreconf.patch 0008-podwrapper.sh-Use-date-from-ChangeLog.patch +0006-Fix-guestfs-supermin-appliance-path.patch diff -Nru libguestfs-1.18.5/debian/rules libguestfs-1.18.5/debian/rules --- libguestfs-1.18.5/debian/rules 2012-07-15 10:41:20.000000000 +0000 +++ libguestfs-1.18.5/debian/rules 2013-01-16 10:34:59.000000000 +0000 @@ -142,4 +142,4 @@ %: dh $@ \ --without=python-support \ - --with=autotools-dev,ocaml,python2,python3,bash-completion,ruby,gir + --with=autoreconf,ocaml,python2,python3,bash-completion,ruby,gir