r498 - in devmapper/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Wed Jan  2 11:27:19 2008
New Revision: 498

Log:
* debian/control: Add quilt to build deps.
* debian/rules: Use quilt.
* debian/patches: Add.


Added:
   devmapper/trunk/debian/patches/
   devmapper/trunk/debian/patches/series
   devmapper/trunk/debian/patches/type-kernel_dev_t.patch
Modified:
   devmapper/trunk/debian/control
   devmapper/trunk/debian/rules

Modified: devmapper/trunk/debian/control
==============================================================================
--- devmapper/trunk/debian/control	(original)
+++ devmapper/trunk/debian/control	Wed Jan  2 11:27:19 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>= 5.0.22), autotools-dev, libselinux1-dev
+Build-Depends: debhelper (>= 5.0.22), autotools-dev, libselinux1-dev, quilt
 Standards-Version: 3.6.2
 
 Package: libdevmapper-dev

Added: devmapper/trunk/debian/patches/series
==============================================================================
--- (empty file)
+++ devmapper/trunk/debian/patches/series	Wed Jan  2 11:27:19 2008
@@ -0,0 +1 @@
+type-kernel_dev_t.patch

Added: devmapper/trunk/debian/patches/type-kernel_dev_t.patch
==============================================================================
--- (empty file)
+++ devmapper/trunk/debian/patches/type-kernel_dev_t.patch	Wed Jan  2 11:27:19 2008
@@ -0,0 +1,43 @@
+--- devmapper-1.02.20.orig/lib/ioctl/libdm-compat.h
++++ devmapper-1.02.20/lib/ioctl/libdm-compat.h
+@@ -19,6 +19,7 @@
+ #include "kdev_t.h"
+ #include <inttypes.h>
+ #include <linux/dm-ioctl.h>
++#include <linux/types.h>
+ #include <sys/ioctl.h>
+ 
+ struct dm_task;
+@@ -40,7 +41,7 @@
+ 	int32_t open_count;	/* out */
+ 	uint32_t flags;		/* in/out */
+ 
+-	__kernel_dev_t dev;	/* in/out */
++	devmapper_kernel_dev_t dev;	/* in/out */
+ 
+ 	char name[DM_NAME_LEN];	/* device name */
+ 	char uuid[DM_UUID_LEN];	/* unique identifier for
+@@ -60,7 +61,7 @@
+ struct dm_target_deps_v1 {
+ 	uint32_t count;
+ 
+-	__kernel_dev_t dev[0];	/* out */
++	devmapper_kernel_dev_t dev[0];	/* out */
+ };
+ 
+ enum {
+--- devmapper-1.02.20.orig/include/kdev_t.h
++++ devmapper-1.02.20/include/kdev_t.h
+@@ -15,8 +15,12 @@
+ #ifndef _DM_KDEV_H
+ #define _DM_KDEV_H
+ 
++#include <linux/types.h>
++
+ #define MAJOR(dev)      ((dev & 0xfff00) >> 8)
+ #define MINOR(dev)      ((dev & 0xff) | ((dev >> 12) & 0xfff00))
+ #define MKDEV(ma,mi)    ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+ 
++typedef __u32 devmapper_kernel_dev_t;
++
+ #endif

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Wed Jan  2 11:27:19 2008
@@ -31,6 +31,7 @@
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
 	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
+	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	cd $(DIR); \
 	./configure \
 		--prefix=/usr \
@@ -51,6 +52,7 @@
 	mkdir -p $(DIR)
 	cp -al $(filter-out debian, $(wildcard *)) $(DIR)
 	cp --remove-destination /usr/share/misc/config.sub /usr/share/misc/config.guess $(DIR)/autoconf
+	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	cd $(DIR); \
 	./configure \
 		--prefix=/usr \