[Dmraid-debian-commits] r26 - in /trunk/debian: changelog patches/00list patches/02_scsi_serial_remove_ws.dpatch

[derevko-guest at users.alioth.debian.org]

Author: derevko-guest
Date: Fri Dec  5 19:51:46 2008
New Revision: 26

URL: http://svn.debian.org/wsvn/dmraid-debian/?sc=1&rev=26
Log:
* debian/patches/02_scsi_serial_remove_ws.dpatch: remove whitespace from
  serial id (LP: #305011)

Added:
    trunk/debian/patches/02_scsi_serial_remove_ws.dpatch   (with props)
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/changelog?rev=26&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Dec  5 19:51:46 2008
@@ -11,8 +11,10 @@
     update-initramfs (fixed command-with-path-in-maintainer-script lintian
     warning)
   * debian/dmraid-activate: modprobe also dm_raid45
-
- -- Giuseppe Iuculano <giuseppe at iuculano.it>  Fri, 05 Dec 2008 10:58:32 +0100
+  * debian/patches/02_scsi_serial_remove_ws.dpatch: remove whitespace from
+    serial id (LP: #305011)
+
+ -- Giuseppe Iuculano <giuseppe at iuculano.it>  Fri, 05 Dec 2008 19:26:41 +0100
 
 dmraid (1.0.0.rc15-1~exp1) experimental; urgency=low
 

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/00list?rev=26&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Fri Dec  5 19:51:46 2008
@@ -1,4 +1,5 @@
 01_fix_broken_linking.dpatch
+02_scsi_serial_remove_ws.dpatch
 03_fix_hyphen-used-as-minus-sign.dpatch
 04_do_not_use_p_for_partition.dpatch
 05_kernel-event-handling.dpatch

Added: trunk/debian/patches/02_scsi_serial_remove_ws.dpatch
URL: http://svn.debian.org/wsvn/dmraid-debian/trunk/debian/patches/02_scsi_serial_remove_ws.dpatch?rev=26&op=file
==============================================================================
--- trunk/debian/patches/02_scsi_serial_remove_ws.dpatch (added)
+++ trunk/debian/patches/02_scsi_serial_remove_ws.dpatch Fri Dec  5 19:51:46 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_scsi_serial_remove_ws.dpatch by Giuseppe Iuculano <giuseppe at iuculano.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove whitespace from serial id (LP: #305011)
+
+ at DPATCH@
+diff -urNad trunk~/1.0.0.rc15/lib/device/scsi.c trunk/1.0.0.rc15/lib/device/scsi.c
+--- trunk~/1.0.0.rc15/lib/device/scsi.c	2008-09-29 18:47:41.000000000 +0200
++++ trunk/1.0.0.rc15/lib/device/scsi.c	2008-12-05 19:16:50.000000000 +0100
+@@ -110,7 +110,10 @@
+ 		}
+ 
+ 		ret = ret &&
+-		     (di->serial = dbg_strdup((char *) &response[p->start + 1]));
++		      (di->serial =
++		       dbg_strdup(remove_white_space(lc,
++				  (char *) &response[p->start + 1],
++				  serial_len)));
+ 	}
+ 
+ 	dbg_free(response);

Propchange: trunk/debian/patches/02_scsi_serial_remove_ws.dpatch
------------------------------------------------------------------------------
    svn:executable = *