[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-4-20-ge91a68e

[Hilko Bengen]

The following commit has been merged in the master branch:
commit a31981154f96d0941029d3af38347531f00742d8
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Jul 29 18:11:15 2011 +0200

    build and install those parts of the supermin appliance that do not
    include external packages

diff --git a/debian/libguestfs0.README b/debian/libguestfs0.README
new file mode 100644
index 0000000..7fc6a0a
--- /dev/null
+++ b/debian/libguestfs0.README
@@ -0,0 +1,16 @@
+libguestfs for Debian
+=====================
+
+The base.img file is not shipped as part of the libguestfs package
+because it contains copies of material from several other .deb
+packages. However, the script that is 
+
+To generate or update this file, it, run the following command (as
+root):
+
+# ( cd /usr/lib/guestfs; ./make.sh )
+
+I realize that this is a sub-optimal solution and promise to improve
+it in one of the next revisions.
+
+ -- Hilko Bengen <bengen at debian.org>, Fri, 29 Jul 2011 18:29:54 +0200
diff --git a/debian/libguestfs0.dirs b/debian/libguestfs0.dirs
index c137c5b..a246276 100644
--- a/debian/libguestfs0.dirs
+++ b/debian/libguestfs0.dirs
@@ -1,5 +1,5 @@
 usr/bin
 usr/lib
-usr/lib/guestfs
+usr/lib/guestfs/supermin.d
 usr/share/man/man1
 usr/share/man/man3
diff --git a/debian/libguestfs0.install b/debian/libguestfs0.install
index 33e5200..54e4242 100644
--- a/debian/libguestfs0.install
+++ b/debian/libguestfs0.install
@@ -1,6 +1,13 @@
 usr/bin/libguestfs-test-tool
 usr/lib/lib*.so.*
-usr/lib/guestfs/*
 usr/share/man/man1/libguestfs-test-tool*
 usr/share/man/man3/guestfs.3*
 usr/share/man/man3/libguestfs.3*
+
+# We do not install supermin.d/base.img, but ship make.sh which can be
+# used to build it.
+appliance/make.sh     usr/lib/guestfs
+appliance/packagelist usr/lib/guestfs
+appliance/excludelist usr/lib/guestfs
+appliance/supermin.d/init.img   usr/lib/guestfs/supermin.d
+appliance/supermin.d/daemon.img usr/lib/guestfs/supermin.d
diff --git a/debian/rules b/debian/rules
index 8dd59fa..e6c0600 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		--disable-appliance  \
 		--with-readline	     \
 		--with-java-home=no  \
 		--disable-ruby       \
@@ -16,6 +17,11 @@ override_dh_strip:
 
 override_dh_auto_build:
 	$(MAKE) INSTALLDIRS=vendor LD_RUN_PATH=""
+# build part of appliance
+	$(MAKE) -C appliance \
+		make.sh \
+		packagelist excludelist \
+		supermin.d/daemon.img supermin.d/init.img
 
 override_dh_install:
 # workaround for #635316

-- 
Libguestfs Debian packaging