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

[Guido Günther]

The following commit has been merged in the master branch:
commit 9c1fbdfcd553930d6ee73b81098659b5d6fbae13
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Feb 21 13:22:54 2010 +0100

    Drop Hardcode-kernel-version.patch
    
    Superflous due to previous commit.

diff --git a/debian/patches/0002-Hardcode-kernel-version.patch b/debian/patches/0002-Hardcode-kernel-version.patch
deleted file mode 100644
index 570126f..0000000
--- a/debian/patches/0002-Hardcode-kernel-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 20 Feb 2010 14:09:15 +0100
-Subject: [PATCH] Hardcode kernel version
-
-until the linux-2.6-<subarch> packages are fixed in sid.
----
- appliance/debian/modules/install_kernel |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/appliance/debian/modules/install_kernel b/appliance/debian/modules/install_kernel
-index c1076ce..204c816 100755
---- a/appliance/debian/modules/install_kernel
-+++ b/appliance/debian/modules/install_kernel
-@@ -37,6 +37,7 @@ if [ -z "$DEBIRF_KERNEL_PACKAGE" ] ; then
-     # generic 2.6-ARCH package in the debirf root (since it may be
-     # different than what is installed on the build host)
-     KNAME=$(debirf_exec apt-cache show linux-image-2.6-"$KARCH" | grep '^Depends: ' | sed 's/^Depends: //')
-+    KNAME=linux-image-2.6.32-2-486
- 
-     # download only the desired kernel package directly into the apt
-     # cache for dpkg extraction
--- 
diff --git a/debian/patches/0003-scrub-now-available-on-Debian.patch b/debian/patches/0002-scrub-now-available-on-Debian.patch
similarity index 100%
rename from debian/patches/0003-scrub-now-available-on-Debian.patch
rename to debian/patches/0002-scrub-now-available-on-Debian.patch
diff --git a/debian/patches/0004-Adjust-error-output-for-regressions-rhbz557655.patch b/debian/patches/0003-Adjust-error-output-for-regressions-rhbz557655.patch
similarity index 100%
rename from debian/patches/0004-Adjust-error-output-for-regressions-rhbz557655.patch
rename to debian/patches/0003-Adjust-error-output-for-regressions-rhbz557655.patch
diff --git a/debian/patches/series b/debian/patches/series
index 559b772..b22b99d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Run-debirf-as-root.patch
-0002-Hardcode-kernel-version.patch
-0003-scrub-now-available-on-Debian.patch
-0004-Adjust-error-output-for-regressions-rhbz557655.patch
+0002-scrub-now-available-on-Debian.patch
+0003-Adjust-error-output-for-regressions-rhbz557655.patch

-- 
Libguestfs Debian packaging