[Dmraid-debian-commits] [SCM] Maintenance of the dmraid package branch, master, updated. debian/1.0.0.rc15-1.exp3-3-gcadad71

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit cadad7161c2eb046b04b3d2e0e0a13c7157cce79
Author: Giuseppe Iuculano <giuseppe at iuculano.it>
Date:   Fri Dec 26 20:56:13 2008 +0100

    debian/patches/07_fix_dmraid_mini_build.dpatch: Removed

diff --git a/debian/patches/00list b/debian/patches/00list
index 834dd71..e9179cd 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,7 +4,6 @@
 04_do_not_use_p_for_partition.dpatch
 05_kernel-event-handling.dpatch
 06_fix_led_support_compilation.dpatch
-07_fix_dmraid_mini_build.dpatch
 09_promise-add-offsets.dpatch
 10_exit_code.dpatch
 12_support_virtio_devices.dpatch
diff --git a/debian/patches/07_fix_dmraid_mini_build.dpatch b/debian/patches/07_fix_dmraid_mini_build.dpatch
deleted file mode 100755
index a7ac021..0000000
--- a/debian/patches/07_fix_dmraid_mini_build.dpatch
+++ /dev/null
@@ -1,108 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_fix_dmraid_mini_build.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix to compile with --enable-mini (for udeb) without FTBFS
-
- at DPATCH@
-diff -urNad dmraid.git~/1.0.0.rc15/include/dmraid/lib_context.h dmraid.git/1.0.0.rc15/include/dmraid/lib_context.h
---- dmraid.git~/1.0.0.rc15/include/dmraid/lib_context.h	2008-12-17 14:17:43.000000000 +0100
-+++ dmraid.git/1.0.0.rc15/include/dmraid/lib_context.h	2008-12-18 20:29:51.000000000 +0100
-@@ -134,11 +134,11 @@
- #ifndef	DMRAID_MINI
- 	BLOCK_DEVICES = 0x8,
- 	COLUMN = 0x10,
--	DBG = 0x20,
- 	DUMP = 0x40,
- 	DMERASE = 0x80,
- 	GROUP = 0x100,
- #endif
-+	DBG = 0x20,
- 	HELP = 0x200,
- #ifndef	DMRAID_MINI
- 	LIST_FORMATS = 0x400,
-@@ -151,24 +151,24 @@
- 	RAID_DEVICES = 0x2000,
- 	RAID_SETS = 0x4000,
- 	TEST = 0x8000,
--	VERBOSE = 0x10000,
- 	ACTIVE = 0x20000,
- 	INACTIVE = 0x40000,
--	SEPARATOR = 0x80000,
- #endif
-+	VERBOSE = 0x10000,
-+	SEPARATOR = 0x80000,
- 	VERSION = 0x100000,
- 	IGNORELOCKING = 0x200000,
- #ifndef DMRAID_MINI
- 	DEL_SETS = 0x400000,
--	CREATE = 0x800000,
--	REBUILD = 0x1000000,
--	SPARE = 0x2000000,
- 	MEDIA = 0x4000000,
- 	END_REBUILD = 0x8000000,
- 	GET_MEMBERS = 0x10000000,
--	PARTCHAR = 0x20000000,
- 
- #endif
-+	SPARE = 0x2000000,
-+	REBUILD = 0x1000000,
-+	CREATE = 0x800000,
-+	PARTCHAR = 0x20000000,
- };
- 
- /* Arguments allowed ? */
-diff -urNad dmraid.git~/1.0.0.rc15/tools/commands.c dmraid.git/1.0.0.rc15/tools/commands.c
---- dmraid.git~/1.0.0.rc15/tools/commands.c	2008-12-17 14:17:43.000000000 +0100
-+++ dmraid.git/1.0.0.rc15/tools/commands.c	2008-12-18 20:30:11.000000000 +0100
-@@ -160,7 +160,7 @@
- 
- 	return lc_stralloc_opt(lc, LC_SEPARATOR, optarg) ? 1 : 0;
- }
--
-+#endif
- /* Check create option arguments. */
- static int
- check_create_argument(struct lib_context *lc, int arg)
-@@ -185,7 +185,6 @@
- 	lc_inc_opt(lc, arg);
- 	return 1;
- }
--#endif
- 
- /* Check and store option for partition separator. */
- static int
-@@ -794,12 +793,15 @@
- 	return 1;
- }
- 
--static int
-+#endif
-+
-+	static int
- _create_sets(struct lib_context *lc, int arg)
- {
- 	return 1;
- }
- 
-+#ifndef DMRAID_MINI
- static int
- _display_devices(struct lib_context *lc, int type)
- {
-@@ -813,6 +815,8 @@
- 	return erase_metadata(lc);
- }
- 
-+#endif
-+
- /* Post hot_spare_add function */
- static int
- _hot_spare_add_set(struct lib_context *lc, void *r, int type)
-@@ -827,7 +831,6 @@
- 	return 1;
- }
- 
--#endif
- 
- 
- /*

-- 
Maintenance of the dmraid package