[Pkg-nagios-changes] [pkg-nagios-snmp-plugins] 02/36: Convert the package to source format 3.0 (quilt)

Jan Wagner waja at moszumanska.debian.org
Wed Mar 5 22:24:31 UTC 2014


This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-snmp-plugins.

commit 1dfc537f8a1a415add0b09226a978df8de92507b
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Feb 19 22:35:36 2014 +0100

    Convert the package to source format 3.0 (quilt)
---
 debian/control                                                   | 2 +-
 debian/patches/00list                                            | 9 ---------
 debian/patches/{01_check_snmp_env.dpatch => 01_check_snmp_env}   | 5 +----
 debian/patches/{02_check_snmp_int.dpatch => 02_check_snmp_int}   | 5 +----
 debian/patches/{03_check_snmp_load.dpatch => 03_check_snmp_load} | 5 +----
 .../{04_check_snmp_process.dpatch => 04_check_snmp_process}      | 5 +----
 .../{05_check_snmp_storage.dpatch => 05_check_snmp_storage}      | 5 +----
 debian/patches/{06_check_snmp_win.dpatch => 06_check_snmp_win}   | 5 +----
 .../{10_fix_net_snmp_version.dpatch => 10_fix_net_snmp_version}  | 4 +---
 ...eck_snmp_storage_64bit.dpatch => 15_check_snmp_storage_64bit} | 4 ----
 debian/patches/{50_disable_epn.dpatch => 50_disable_epn}         | 5 +----
 debian/patches/series                                            | 9 +++++++++
 debian/rules                                                     | 6 ++----
 debian/source/format                                             | 2 +-
 14 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/debian/control b/debian/control
index ab918bc..37526c6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Jan Wagner <waja at cyconet.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5)
 Homepage: http://www.manubulon.com/nagios/index_snmp.html
 Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios-snmp-plugins.git
 Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios-snmp-plugins
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index da00a76..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,9 +0,0 @@
-01_check_snmp_env.dpatch
-02_check_snmp_int.dpatch
-03_check_snmp_load.dpatch
-04_check_snmp_process.dpatch
-05_check_snmp_storage.dpatch
-06_check_snmp_win.dpatch
-10_fix_net_snmp_version.dpatch
-15_check_snmp_storage_64bit.dpatch
-50_disable_epn.dpatch
diff --git a/debian/patches/01_check_snmp_env.dpatch b/debian/patches/01_check_snmp_env
similarity index 97%
rename from debian/patches/01_check_snmp_env.dpatch
rename to debian/patches/01_check_snmp_env
index 9fcd9f6..c093cf8 100644
--- a/debian/patches/01_check_snmp_env.dpatch
+++ b/debian/patches/01_check_snmp_env
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01_check_snmp_env.dpatch by Jan Wagner <waja at cyconet.org>
+## 01_check_snmp_env by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Fix some issues via cvs version
 
- at DPATCH@
-
 --- old/check_snmp_env.pl	2007-07-04 09:46:55.000000000 +0200
 +++ new/check_snmp_env.pl	2007-07-06 22:17:06.000000000 +0200
 @@ -1,7 +1,7 @@
diff --git a/debian/patches/02_check_snmp_int.dpatch b/debian/patches/02_check_snmp_int
similarity index 99%
rename from debian/patches/02_check_snmp_int.dpatch
rename to debian/patches/02_check_snmp_int
index 964478d..3ef2053 100644
--- a/debian/patches/02_check_snmp_int.dpatch
+++ b/debian/patches/02_check_snmp_int
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02_check_snmp_int.dpatch by Jan Wagner <waja at cyconet.org>
+## 02_check_snmp_int by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Update script to version 1.24
 
- at DPATCH@
-
 
 diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_int.pl nagios-snmp-plugins-1.1.1/check_snmp_int.pl
 --- nagios-snmp-plugins-1.1.1.orig/check_snmp_int.pl	2007-04-23 11:40:39.000000000 +0200
diff --git a/debian/patches/03_check_snmp_load.dpatch b/debian/patches/03_check_snmp_load
similarity index 92%
rename from debian/patches/03_check_snmp_load.dpatch
rename to debian/patches/03_check_snmp_load
index e0dc967..9539b73 100644
--- a/debian/patches/03_check_snmp_load.dpatch
+++ b/debian/patches/03_check_snmp_load
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03_check_snmp_load.dpatch by Jan Wagner <waja at cyconet.org>
+## 03_check_snmp_load by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Update script to version 1.12
 
- at DPATCH@
-
 diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_load.pl nagios-snmp-plugins-1.1.1/check_snmp_load.pl
 --- nagios-snmp-plugins-1.1.1.orig/check_snmp_load.pl	2007-04-16 19:41:20.000000000 +0200
 +++ nagios-snmp-plugins-1.1.1/check_snmp_load.pl	2007-10-12 22:23:23.000000000 +0200
diff --git a/debian/patches/04_check_snmp_process.dpatch b/debian/patches/04_check_snmp_process
similarity index 98%
rename from debian/patches/04_check_snmp_process.dpatch
rename to debian/patches/04_check_snmp_process
index 858421a..4476752 100644
--- a/debian/patches/04_check_snmp_process.dpatch
+++ b/debian/patches/04_check_snmp_process
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04_check_snmp_process.dpatch by Jan Wagner <waja at cyconet.org>
+## 04_check_snmp_process by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Update script to version 1.10
 
- at DPATCH@
-
 diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_process.pl nagios-snmp-plugins-1.1.1/check_snmp_process.pl
 --- nagios-snmp-plugins-1.1.1.orig/check_snmp_process.pl	2007-03-12 21:36:02.000000000 +0100
 +++ nagios-snmp-plugins-1.1.1/check_snmp_process.pl	2007-10-12 22:23:24.000000000 +0200
diff --git a/debian/patches/05_check_snmp_storage.dpatch b/debian/patches/05_check_snmp_storage
similarity index 98%
rename from debian/patches/05_check_snmp_storage.dpatch
rename to debian/patches/05_check_snmp_storage
index 99f8208..c7c675d 100644
--- a/debian/patches/05_check_snmp_storage.dpatch
+++ b/debian/patches/05_check_snmp_storage
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 05_check_snmp_storage.dpatch by Jan Wagner <waja at cyconet.org>
+## 05_check_snmp_storage by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Update script to version 1.3.3 
 
- at DPATCH@
-
 diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_storage.pl nagios-snmp-plugins-1.1.1/check_snmp_storage.pl
 --- nagios-snmp-plugins-1.1.1.orig/check_snmp_storage.pl	2007-03-12 22:01:36.000000000 +0100
 +++ nagios-snmp-plugins-1.1.1/check_snmp_storage.pl	2007-10-12 22:23:24.000000000 +0200
diff --git a/debian/patches/06_check_snmp_win.dpatch b/debian/patches/06_check_snmp_win
similarity index 94%
rename from debian/patches/06_check_snmp_win.dpatch
rename to debian/patches/06_check_snmp_win
index bee1eed..01a721a 100644
--- a/debian/patches/06_check_snmp_win.dpatch
+++ b/debian/patches/06_check_snmp_win
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 06_check_snmp_win.dpatch by Jan Wagner <waja at cyconet.org>
+## 06_check_snmp_win by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Update script to version 1.1 
 
- at DPATCH@
-
 diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_win.pl nagios-snmp-plugins-1.1.1/check_snmp_win.pl
 --- nagios-snmp-plugins-1.1.1.orig/check_snmp_win.pl	2006-11-29 20:59:55.000000000 +0100
 +++ nagios-snmp-plugins-1.1.1/check_snmp_win.pl	2007-10-12 22:23:25.000000000 +0200
diff --git a/debian/patches/10_fix_net_snmp_version.dpatch b/debian/patches/10_fix_net_snmp_version
similarity index 99%
rename from debian/patches/10_fix_net_snmp_version.dpatch
rename to debian/patches/10_fix_net_snmp_version
index 83a5304..c8cb20c 100755
--- a/debian/patches/10_fix_net_snmp_version.dpatch
+++ b/debian/patches/10_fix_net_snmp_version
@@ -1,10 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_net_snmp_version.dpatch by Jan Wagner <waja at cyconet.org>
+## 10_fix_net_snmp_version by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: Fixing Net::SNMP version
 ## DP: (see https://wiki.icinga.org/display/howtos/check_snmp#checksnmp-Argumentv601isntnumericinnumericlt)
 
- at DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_boostedge.pl nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl
 --- nagios-snmp-plugins-1.1.1~/check_snmp_boostedge.pl	2007-01-16 23:57:14.000000000 +0100
 +++ nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl	2013-01-31 08:38:55.000000000 +0100
diff --git a/debian/patches/15_check_snmp_storage_64bit.dpatch b/debian/patches/15_check_snmp_storage_64bit
similarity index 99%
rename from debian/patches/15_check_snmp_storage_64bit.dpatch
rename to debian/patches/15_check_snmp_storage_64bit
index e83c089..aaa291a 100644
--- a/debian/patches/15_check_snmp_storage_64bit.dpatch
+++ b/debian/patches/15_check_snmp_storage_64bit
@@ -1,10 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 15_check_snmp_storage_64bit by Martin Fürstenau
 ##
 ## DP: Fixing Net::SNMP version
 ## DP: (see https://wiki.icinga.org/display/howtos/check_snmp#checksnmp-Argumentv601isntnumericinnumericlt)
 
-## @DPATCH@
 ## From 144c57a0adda190000bef500f3274425cb90d6ba Mon Sep 17 00:00:00 2001
 ## From: Michael Friedrich <michael.friedrich at gmail.com>
 ## Date: Wed, 26 Sep 2012 16:32:40 +0200
@@ -19,8 +17,6 @@
  plugins/check_snmp_storage.pl | 54 ++++++++++++++++++++++++++++---------------
  1 file changed, 36 insertions(+), 18 deletions(-)
 
- at DPATCH@
-
 diff --git a/plugins/check_snmp_storage.pl b/plugins/check_snmp_storage.pl
 index 1b8a398..a3c784f 100644
 --- a/plugins/check_snmp_storage.pl
diff --git a/debian/patches/50_disable_epn.dpatch b/debian/patches/50_disable_epn
similarity index 98%
rename from debian/patches/50_disable_epn.dpatch
rename to debian/patches/50_disable_epn
index 1c504fd..5cec8b8 100644
--- a/debian/patches/50_disable_epn.dpatch
+++ b/debian/patches/50_disable_epn
@@ -1,10 +1,7 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 50_disable_epn.dpatch by Jan Wagner <waja at cyconet.org>
+## 50_disable_epn by Jan Wagner <waja at cyconet.org>
 ##
 ## DP: leave marks to disable epn
 
- at DPATCH@
-
 diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_boostedge.pl nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl
 --- nagios-snmp-plugins-1.1.1.orig/check_snmp_boostedge.pl	2007-01-16 23:57:14.000000000 +0100
 +++ nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl	2008-05-23 14:09:04.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..919403b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+01_check_snmp_env
+02_check_snmp_int
+03_check_snmp_load
+04_check_snmp_process
+05_check_snmp_storage
+06_check_snmp_win
+10_fix_net_snmp_version
+15_check_snmp_storage_64bit
+50_disable_epn
diff --git a/debian/rules b/debian/rules
index c5fdedd..6e83254 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 COMMANDDEFPATH:=/etc/nagios-plugins/config/
 NP_DIR:=debian/nagios-snmp-plugins
 NP_TEMPLATES:=$(NP_DIR)/usr/share/nagios-snmp-plugins/pluginconfig
@@ -13,9 +11,9 @@ NP_LIBEXEC:=/usr/lib/nagios/plugins
 plugin_cfgs:=snmp_cpfw snmp_env snmp_int snmp_load snmp_mem snmp_process \
 	snmp_storage snmp_vrrp snmp_win
 
-build: patch-stamp
+build:
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-snmp-plugins.git



More information about the Pkg-nagios-changes mailing list