From f412e4abbb2b0e3c97d544e0ffb2621747109537 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 20 Aug 2015 12:32:33 +0200 Subject: [PATCH] Convert the package to source format 3.0 (quilt) --- debian/control | 2 +- debian/patches/00list | 2 -- .../{02_check_icmp_links.dpatch => 02_check_icmp_links} | 4 +--- debian/patches/series | 2 ++ debian/rules | 8 +++----- debian/source/format | 2 +- debian/source/options | 1 + 7 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{02_check_icmp_links.dpatch => 02_check_icmp_links} (93%) create mode 100644 debian/patches/series create mode 100644 debian/source/options diff --git a/debian/control b/debian/control index 7ee1809..7f8aa18 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt -Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libdbi-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libfreeradius-client-dev | libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper +Build-Depends: debhelper (>= 5), perl, autotools-dev, libdbi-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libfreeradius-client-dev | libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper Homepage: https://www.monitoring-plugins.org Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-nagios/pkg-monitoring-plugins.git Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-monitoring-plugins.git diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 35b85ec..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -02_check_icmp_links.dpatch -# commited upstream diff --git a/debian/patches/02_check_icmp_links.dpatch b/debian/patches/02_check_icmp_links similarity index 93% rename from debian/patches/02_check_icmp_links.dpatch rename to debian/patches/02_check_icmp_links index 6dccf1d..591683c 100644 --- a/debian/patches/02_check_icmp_links.dpatch +++ b/debian/patches/02_check_icmp_links @@ -1,9 +1,7 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_check_icmp_links.dpatch by Jan Wagner +## 02_check_icmp_links by Jan Wagner ## ## DP: Create symlinks for check_icmp to provide default values for some situations -@DPATCH@ diff -urNad nagios-plugins-1.4.14~/plugins-root/Makefile.am nagios-plugins-1.4.14/plugins-root/Makefile.am --- nagios-plugins-1.4.14~/plugins-root/Makefile.am 2008-11-30 22:23:18.000000000 +0100 +++ nagios-plugins-1.4.14/plugins-root/Makefile.am 2010-01-10 20:39:03.000000000 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..de39cb6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +02_check_icmp_links +# commited upstream diff --git a/debian/rules b/debian/rules index 87de987..c6cd1fc 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,6 @@ export DEB_BUILD_HARDENING=1 PACKAGE = monitoring-plugins -include /usr/share/dpatch/dpatch.make - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -120,15 +118,15 @@ config.status: configure build: build-arch build-indep -build-arch: patch-stamp build-stamp -build-indep: patch-stamp build-stamp +build-arch: build-stamp +build-indep: build-stamp build-stamp: config.status dh_testdir $(MAKE) touch build-stamp -clean: really-clean unpatch +clean: really-clean really-clean: dh_testdir 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) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..a729099 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = '^\.travis'