[Pkg-libvirt-commits] [SCM] Virt-what Debian packaging branch, master, updated. debian/1.1-2-6-gdfcb745

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 21aa31a68c405d5d112c91b5af2123a8167f56e9
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Fri Dec 25 01:06:56 2009 +0100

    Drop patches.
    
    0001-Change-virt-what-cpuid-helper-path-to-usr-lib-virt-w.patch - fixed upstream.
    0002-Add-UML-support.patch - applied upstream.
    0003-Add-VirtualBox-support.patch - applied upstream.

diff --git a/debian/control b/debian/control
index 766ddaa..fdc4815 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
 Uploaders: Laurent Léonard <laurent at open-minds.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt
+Build-Depends: cdbs, debhelper (>= 7)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/pkg-libvirt/virt-what.git
 Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/virt-what.git
diff --git a/debian/patches/0001-Change-virt-what-cpuid-helper-path-to-usr-lib-virt-w.patch b/debian/patches/0001-Change-virt-what-cpuid-helper-path-to-usr-lib-virt-w.patch
deleted file mode 100644
index 90cef88..0000000
--- a/debian/patches/0001-Change-virt-what-cpuid-helper-path-to-usr-lib-virt-w.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Sat, 25 Jul 2009 21:49:06 +0200
-Subject: [PATCH] Change virt-what-cpuid-helper path to /usr/lib/virt-what.
-
----
- virt-what.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/virt-what.in b/virt-what.in
-index cc61aae..d0ac095 100644
---- a/virt-what.in
-+++ b/virt-what.in
-@@ -90,7 +90,7 @@ fi
- # To tell if it is Xen and KVM HVM (fully virtualized) we can use this
- # helper C program.
- 
--cpuid=`virt-what-cpuid-helper`
-+cpuid=`/usr/lib/virt-what/virt-what-cpuid-helper`
- 
- # Check for Xen.
- 
--- 
diff --git a/debian/patches/0002-Add-UML-support.patch b/debian/patches/0002-Add-UML-support.patch
deleted file mode 100644
index 1658d21..0000000
--- a/debian/patches/0002-Add-UML-support.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Fri, 7 Aug 2009 15:22:54 +0200
-Subject: [PATCH] Add UML support.
-
----
- virt-what.in  |    6 ++++++
- virt-what.pod |    8 ++++++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/virt-what.in b/virt-what.in
-index d0ac095..eaaf322 100644
---- a/virt-what.in
-+++ b/virt-what.in
-@@ -87,6 +87,12 @@ if [ -d /proc/vz -a ! -d /proc/bc ]; then
-     echo openvz
- fi
- 
-+# Check for UML.
-+# Added by Laurent Léonard.
-+if grep -q 'UML' /proc/cpuinfo; then
-+    echo uml
-+fi
-+
- # To tell if it is Xen and KVM HVM (fully virtualized) we can use this
- # helper C program.
- 
-diff --git a/virt-what.pod b/virt-what.pod
-index 0cfb753..79da9a9 100644
---- a/virt-what.pod
-+++ b/virt-what.pod
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
- 
- virt-what - detect if we are running in a virtual machine
-@@ -42,6 +44,12 @@ This is QEMU.
- 
- Status: confirmed by RWMJ.
- 
-+=item B<uml>
-+
-+This is a User-Mode Linux (UML) guest.
-+
-+Status: contributed by Laurent Léonard
-+
- =item B<virtualpc>
- 
- The guest appears to be running on Microsoft VirtualPC.
--- 
diff --git a/debian/patches/0003-Add-VirtualBox-support.patch b/debian/patches/0003-Add-VirtualBox-support.patch
deleted file mode 100644
index e82f832..0000000
--- a/debian/patches/0003-Add-VirtualBox-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
-Date: Fri, 7 Aug 2009 15:23:27 +0200
-Subject: [PATCH] Add VirtualBox support.
-
----
- virt-what.in  |    6 ++++++
- virt-what.pod |    6 ++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/virt-what.in b/virt-what.in
-index eaaf322..37b4fb4 100644
---- a/virt-what.in
-+++ b/virt-what.in
-@@ -77,6 +77,12 @@ if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
-     echo virtualpc
- fi
- 
-+# Check for VirtualBox.
-+# Added by Laurent Léonard.
-+if echo "$dmi" | grep -q 'Manufacturer: innotek GmbH'; then
-+    echo virtualbox
-+fi
-+
- # Check for OpenVZ / Virtuozzo.
- # Added by Evgeniy Sokolov.
- # /proc/vz - always exists if OpenVZ kernel is running (inside and outside
-diff --git a/virt-what.pod b/virt-what.pod
-index 79da9a9..6451c06 100644
---- a/virt-what.pod
-+++ b/virt-what.pod
-@@ -50,6 +50,12 @@ This is a User-Mode Linux (UML) guest.
- 
- Status: contributed by Laurent Léonard
- 
-+=item B<virtualbox>
-+
-+This is a VirtualBox guest.
-+
-+Status: contributed by Laurent Léonard
-+
- =item B<virtualpc>
- 
- The guest appears to be running on Microsoft VirtualPC.
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 094db26..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Change-virt-what-cpuid-helper-path-to-usr-lib-virt-w.patch
-0002-Add-UML-support.patch
-0003-Add-VirtualBox-support.patch
diff --git a/debian/rules b/debian/rules
index 34bea91..96e0482 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_DOCS_ALL =
 

-- 
Virt-what Debian packaging