From 427cb051d86106de5c27449bfef568e999a5ecc2 Mon Sep 17 00:00:00 2001 From: Marc Haber Date: Fri, 20 Jan 2006 19:02:08 +0000 Subject: [PATCH] * add 23_check_axis.dpatch, making the package suiteable to debian/-only layout --- debian/changelog | 5 ++++- debian/patches/00list | 1 + debian/patches/23_check_axis.dpatch | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 debian/patches/23_check_axis.dpatch diff --git a/debian/changelog b/debian/changelog index 20c57c3..d055087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ nagios-plugins (1.4.2-6) unreleased; urgency=low * NOT YET RELEASED * migrate package from CVS to svn + * add 23_check_axis.dpatch, making the package suiteable to + debian/-only layout + * convert to debian/-only layout - -- Marc Haber Fri, 20 Jan 2006 18:59:42 +0000 + -- Marc Haber Fri, 20 Jan 2006 19:01:25 +0000 nagios-plugins (1.4.2-5) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 058975a..0521098 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -12,3 +12,4 @@ 20_check_ntp_lessbeastlyregex.dpatch 21_de.po_fixes.dpatch 22_check_smb_hostaddress.dpatch +23_check_axis.dpatch diff --git a/debian/patches/23_check_axis.dpatch b/debian/patches/23_check_axis.dpatch new file mode 100755 index 0000000..f8e6eb7 --- /dev/null +++ b/debian/patches/23_check_axis.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_check_axis.dpatch by Marc Haber +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/contrib/check_axis.sh trunk/contrib/check_axis.sh +--- trunk~/contrib/check_axis.sh 2003-05-26 10:09:23.000000000 +0000 ++++ trunk/contrib/check_axis.sh 2006-01-20 19:00:46.000000000 +0000 +@@ -29,9 +29,11 @@ + status=`echo $lines | awk '{ print $3 }'` + if [ "$status" == "Printing" ]; then + bytes=`echo $lines | awk '{ print $4 }'`; +- comments=`echo $lines | tr -d " " | awk '{ print $5 " " $6 }'`; ++ comments=`echo $lines | tr -d " ++" | awk '{ print $5 " " $6 }'`; + else +- comments=`echo $lines | tr -d " " | awk '{ print $4 " " $5 }'`; ++ comments=`echo $lines | tr -d " ++" | awk '{ print $4 " " $5 }'`; + fi + + comma=`echo $comments | grep , | wc -l`