[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-3-8-g3b14f9c

[Guido Günther]

The following commit has been merged in the master branch:
commit 465def24ce834d54266d64b3a2a21d456cee9b4c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Feb 24 09:10:41 2010 +0100

    New patch 0007-Debina-package-format-is-called-deb-not-dpkg.patch
    
    Debina package format is called 'deb' not 'dpkg'

diff --git a/debian/patches/0007-Debina-package-format-is-called-deb-not-dpkg.patch b/debian/patches/0007-Debina-package-format-is-called-deb-not-dpkg.patch
new file mode 100644
index 0000000..c4a235a
--- /dev/null
+++ b/debian/patches/0007-Debina-package-format-is-called-deb-not-dpkg.patch
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Tue, 23 Feb 2010 21:04:37 +0100
+Subject: [PATCH] Debina package format is called 'deb' not 'dpkg'
+
+---
+ perl/lib/Sys/Guestfs/Lib.pm |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
+index 2864bfa..c7b5e7e 100644
+--- a/perl/lib/Sys/Guestfs/Lib.pm
++++ b/perl/lib/Sys/Guestfs/Lib.pm
+@@ -665,7 +665,7 @@ Operating system distribution.  One of: "fedora", "rhel", "centos",
+ =item package_format
+ 
+ (For Linux root partitions only)
+-The package format used by the guest distribution. One of: "rpm", "dpkg".
++The package format used by the guest distribution. One of: "rpm", "deb".
+ 
+ =item package_management
+ 
+@@ -869,7 +869,7 @@ sub _check_linux_root
+             $r->{osdistro} = "redhat-based";
+         }
+     } elsif ($g->is_file ("/etc/debian_version")) {
+-        $r->{package_format} = "dpkg";
++        $r->{package_format} = "deb";
+         $r->{package_management} = "apt";
+ 
+         $_ = $g->cat ("/etc/debian_version");
+-- 

-- 
Libguestfs Debian packaging