Browse Source

debian/patches:

- Removed old patches.
- Added 02_no_hyphen_in_manpages.patch to fix all lintian warnings.
- Added descriptions to patches.
David Martínez Moreno 14 years ago
parent
commit
3b110f5ddc

+ 4 - 0
debian/patches/01_no_bashisms

@@ -1,3 +1,7 @@
+# 01_no_bashisms.patch
+# 
+# This patch avois calling directly to /bin/sh.
+#
 Index: aoetools-30/aoe-mkdevs
 Index: aoetools-30/aoe-mkdevs
 ===================================================================
 ===================================================================
 --- aoetools-30.orig/aoe-mkdevs
 --- aoetools-30.orig/aoe-mkdevs

+ 0 - 13
debian/patches/02_dash_compliancy_fixes

@@ -1,13 +0,0 @@
-Index: aoetools-30/aoe-flush.in
-===================================================================
---- aoetools-30.orig/aoe-flush.in
-+++ aoetools-30/aoe-flush.in
-@@ -19,7 +19,7 @@ fi
- 
- # make sure that each device in the whitespace-separated
- # list exists
--verify_devs () {
-+function verify_devs () {
- 	err=""
- 	for d; do
- 		aoe-stat |

+ 97 - 0
debian/patches/02_no_hyphen_in_manpages.patch

@@ -0,0 +1,97 @@
+# 02_no_hyphen_in_manpages.patch
+#
+# Patched all the manpages in order to avoid usual hyphen->minus confusion.
+#
+Index: aoetools-30/aoecfg.8
+===================================================================
+--- aoetools-30.orig/aoecfg.8
++++ aoetools-30/aoecfg.8
+@@ -3,7 +3,7 @@
+ aoecfg \- manipulate AoE configuration strings
+ .SH SYNOPSIS
+ .B aoecfg
+-[-c \fIcmd\fR] [-s \fIcfgstr\fR] [-t \fItimeout\fR] [\fIshelf slot\fR] [\fInetif\fR]
++[\-c \fIcmd\fR] [\-s \fIcfgstr\fR] [\-t \fItimeout\fR] [\fIshelf slot\fR] [\fInetif\fR]
+ .fi
+ .SH DESCRIPTION
+ .IR Aoecfg (8)
+Index: aoetools-30/aoe-mkdevs.8
+===================================================================
+--- aoetools-30.orig/aoe-mkdevs.8
++++ aoetools-30/aoe-mkdevs.8
+@@ -52,13 +52,13 @@ sysadmin gets rid of the mismatching dev
+ .IP
+ .EX
+ .nf
+-nai:~# rm -rf /dev/etherd 
++nai:~# rm \-rf /dev/etherd
+ nai:~# aoe-mkdevs /dev/etherd
+-nai:~# ls /dev/etherd | wc -l
++nai:~# ls /dev/etherd | wc \-l
+ 1603
+-nai:~# rm -rf /dev/etherd
++nai:~# rm \-rf /dev/etherd
+ nai:~# n_partitions=1 aoe-mkdevs /dev/etherd
+-nai:~# ls /dev/etherd | wc -l
++nai:~# ls /dev/etherd | wc \-l
+ 103
+ .fi
+ .EE
+Index: aoetools-30/aoe-mkshelf.8
+===================================================================
+--- aoetools-30.orig/aoe-mkshelf.8
++++ aoetools-30/aoe-mkshelf.8
+@@ -52,11 +52,11 @@ command is called again with \fIn_partit
+ .EX
+ .nf
+ nai:~# aoe-mkshelf /dev/etherd 7
+-nai:~# ls /dev/etherd/e7.* | wc -l
++nai:~# ls /dev/etherd/e7.* | wc \-l
+ 160
+ nai:~# rm /dev/etherd/e7.*        
+ nai:~# n_partitions=1 aoe-mkshelf /dev/etherd 7
+-nai:~# ls /dev/etherd/e7.* | wc -l
++nai:~# ls /dev/etherd/e7.* | wc \-l
+ 10
+ nai:~# 
+ .fi
+Index: aoetools-30/aoeping.8
+===================================================================
+--- aoetools-30.orig/aoeping.8
++++ aoetools-30/aoeping.8
+@@ -69,7 +69,7 @@ requires data 
+ transfer, one sector (512 bytes) of data is always the amount
+ transfered.  If the command takes a parameter (for the Low LBA
+ register), then the name of the SMART command is immediately followed
+-by a colon and then a number, the value of the parameter, e.g., "-S
++by a colon and then a number, the value of the parameter, e.g., "\-S
+ read_log:1".
+ .IP
+   read_data
+@@ -119,7 +119,7 @@ network interface eth0.
+ .IP
+ .EX
+ .nf
+-bash# aoeping -v 10 9 eth0 | head
++bash# aoeping \-v 10 9 eth0 | head
+ tag: 80000000
+ eth: eth0
+ shelf: 10
+@@ -139,7 +139,7 @@ timeout. 
+ .IP
+ .EX
+ .nf
+-bash# aoeping -i -s 20 \\
++bash# aoeping \-i \-s 20 \\
+   10 9 eth0 > /dev/null \\
+   && echo ok
+ ok
+@@ -154,7 +154,7 @@ threshold.
+ .IP
+ .EX
+ .nf
+-bash# aoeping -S return_status \\
++bash# aoeping \-S return_status \\
+   10 9 eth0 | grep 'LBA Mid: 0x4f' \\
+   > /dev/null \\
+   && echo ok

+ 2 - 1
debian/patches/series

@@ -1 +1,2 @@
-01_no_bashisms
+01_no_bashisms.patch
+02_no_hyphen_in_manpages.patch