[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.61-1-5-g344c7e6

Laurent Léonard laurent at open-minds.org
Fri Dec 25 23:13:04 UTC 2009


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

    Drop patch 0001-add-nls_base.ko-and-nls_cp437.ko-for-vfat.patch.
    
    Fixed upstream.

diff --git a/debian/control b/debian/control
index 54c1a6e..610abcf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
 Uploaders: Richard Jones <rjones at redhat.com>, Guido Günther <agx at sigxcpu.org>
-Build-Depends: debhelper (>= 7), autotools-dev, quilt,
+Build-Depends: debhelper (>= 7), autotools-dev,
   debirf, libreadline-dev, squashfs-tools, cdbs, libaugeas-dev, qemu,
 # when building from git:
   automake, autoconf, libtool, ocaml,
diff --git a/debian/patches/0001-add-nls_base.ko-and-nls_cp437.ko-for-vfat.patch b/debian/patches/0001-add-nls_base.ko-and-nls_cp437.ko-for-vfat.patch
deleted file mode 100644
index af0b4b3..0000000
--- a/debian/patches/0001-add-nls_base.ko-and-nls_cp437.ko-for-vfat.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 18 Jul 2009 18:20:29 +0200
-Subject: [PATCH] add nls_base.ko and nls_cp437.ko for vfat
-
----
- appliance/kmod.whitelist    |    2 ++
- appliance/kmod.whitelist.in |    4 +++-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/appliance/kmod.whitelist b/appliance/kmod.whitelist
-index 60681fe..b0c0590 100644
---- a/appliance/kmod.whitelist
-+++ b/appliance/kmod.whitelist
-@@ -22,6 +22,8 @@ fat.ko
- udf.ko
- crc_itu_t.ko
- nls_utf8.ko
-+nls_cp437.ko
-+nls_base.ko
- dm-*.ko
- cramfs.ko
- squashfs.ko
-diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in
-index 734b3c4..1b98787 100644
---- a/appliance/kmod.whitelist.in
-+++ b/appliance/kmod.whitelist.in
-@@ -36,6 +36,8 @@ fat.ko
- udf.ko
- crc_itu_t.ko
- nls_utf8.ko
-+nls_cp437.ko
-+nls_base.ko
- 
- dm-*.ko
- 
-@@ -47,4 +49,4 @@ ufs.ko
- exportfs.ko
- xfs.ko
- 
--reiserfs.ko
-\ No newline at end of file
-+reiserfs.ko
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ca80b8c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-add-nls_base.ko-and-nls_cp437.ko-for-vfat.patch
diff --git a/debian/rules b/debian/rules
index 6d813b1..3145d62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ REPO=sid
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEBIAN_SKIP_TEST := \
 	SKIP_TEST_HEXDUMP_0 \

-- 
Libguestfs Debian packaging



More information about the Pkg-libvirt-commits mailing list