[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 65f28578bf940c0f77344e7e6d26dd9c039a11ce
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Jul 20 20:35:38 2011 +0200

    debian/*: merge upstream's other changes

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..9e072be
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,19 @@
+/*.debhelper
+/*.debhelper.log
+/*.substvars
+/substvars
+/files
+
+/tmp
+/guestfish
+/guestmount
+/libguestfs-dev
+/libguestfs-doc
+/libguestfs-perl
+/libguestfs-tools
+/libguestfs0-dbg
+/libguestfs0
+/libguestfs-ocaml-dev
+/libguestfs-ocaml
+/python-guestfs
+
diff --git a/debian/guestfish.install b/debian/guestfish.install
index af574d0..3e54b26 100644
--- a/debian/guestfish.install
+++ b/debian/guestfish.install
@@ -1,6 +1,2 @@
 usr/bin/guestfish
-usr/bin/guestmount
-usr/bin/virt-*
-usr/bin/hivex*
-usr/share/man/man1/*
-
+usr/share/man/man1/guestfish*
diff --git a/debian/guestmount.dirs b/debian/guestmount.dirs
new file mode 100644
index 0000000..98d1583
--- /dev/null
+++ b/debian/guestmount.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1
diff --git a/debian/guestmount.install b/debian/guestmount.install
new file mode 100644
index 0000000..35f65be
--- /dev/null
+++ b/debian/guestmount.install
@@ -0,0 +1,2 @@
+usr/bin/guestmount
+usr/share/man/man1/guestmount*
diff --git a/debian/libguestfs-dev.install b/debian/libguestfs-dev.install
index 0abb3b4..6b172db 100644
--- a/debian/libguestfs-dev.install
+++ b/debian/libguestfs-dev.install
@@ -3,3 +3,6 @@ usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/*.la
 usr/lib/pkgconfig/*
+usr/share/man/man3/guestfs-examples.3*
+usr/share/man/man3/guestfs-ocaml.3*
+usr/share/man/man3/guestfs-python.3*
diff --git a/debian/libguestfs-tools.dirs b/debian/libguestfs-tools.dirs
new file mode 100644
index 0000000..98d1583
--- /dev/null
+++ b/debian/libguestfs-tools.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1
diff --git a/debian/libguestfs-tools.install b/debian/libguestfs-tools.install
new file mode 100644
index 0000000..df3975f
--- /dev/null
+++ b/debian/libguestfs-tools.install
@@ -0,0 +1,2 @@
+usr/bin/virt-*
+usr/share/man/man1/virt-*
diff --git a/debian/libguestfs0.dirs b/debian/libguestfs0.dirs
index 65caf2f..c137c5b 100644
--- a/debian/libguestfs0.dirs
+++ b/debian/libguestfs0.dirs
@@ -1,3 +1,5 @@
+usr/bin
 usr/lib
 usr/lib/guestfs
-usr/share/man/man3
\ No newline at end of file
+usr/share/man/man1
+usr/share/man/man3
diff --git a/debian/libguestfs0.install b/debian/libguestfs0.install
index 47b60b8..33e5200 100644
--- a/debian/libguestfs0.install
+++ b/debian/libguestfs0.install
@@ -1,3 +1,6 @@
+usr/bin/libguestfs-test-tool
 usr/lib/lib*.so.*
 usr/lib/guestfs/*
-usr/share/man/man3/*
\ No newline at end of file
+usr/share/man/man1/libguestfs-test-tool*
+usr/share/man/man3/guestfs.3*
+usr/share/man/man3/libguestfs.3*
diff --git a/debian/python-guestfs.install b/debian/python-guestfs.install
index 0762e99..d8c0fc6 100644
--- a/debian/python-guestfs.install
+++ b/debian/python-guestfs.install
@@ -1,2 +1,2 @@
-usr/lib/python*/*/*.py
-usr/lib/python*/*/*.so
+usr/share/pyshared/*.py
+usr/share/pyshared/*.so*

-- 
Libguestfs Debian packaging