From da180666249aa8fa290d55344fd0bff2304acf34 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 19 Jul 2009 13:16:00 +0200 Subject: [PATCH] patches: Removed static_sstrerror.dpatch. This patch has been included in the new upstream release. No longer build-depend and use dpatch. --- debian/changelog | 7 +------ debian/control | 2 +- debian/patches/00list | 2 -- debian/patches/static_sstrerror.dpatch | 21 --------------------- debian/rules | 6 ++---- 5 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 debian/patches/00list delete mode 100755 debian/patches/static_sstrerror.dpatch diff --git a/debian/changelog b/debian/changelog index 25edddf..22c8c35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ liboping (1.3.0-1) unstable; urgency=low - Do not ignore 'make clean' errors. - Use config.{guess,sub} provided by autotools-dev to fix a FTBFS on avr32, thanks to Bradley Smith for reporting this (Closes: #529460). - - Use dpatch. - Use dh_install's --fail-missing instead of --list-missing. - Pass CFLAGS as arguments to configure instead of setting them in the environment - this is the recommended way. @@ -14,16 +13,12 @@ liboping (1.3.0-1) unstable; urgency=low - Use ${binary:Version} instead of ${Source-Version}. - Updated Standards-Version to 3.8.1. - Added Homepage and Vcs-{Git,Browser} fields. - - Build-depend on dpatch. - Removed duplicate field "Section" for package "liboping0". - Added versioned build dependency on dpkg-dev (>= 1.14.6) to support the Homepage and Vcs-* fields. - Let the -dev package depend on a strict version of the lib package - the -dev package includes a symlink to the full soname, not only the major version. - * debian/patches/: - - Added static_sstrerror.dpatch - upstream patch to make a private - function in liboping static. * debian/compat: - Updated to compat version 5. * Added new binary package "libnet-oping-perl": @@ -35,7 +30,7 @@ liboping (1.3.0-1) unstable; urgency=low * debian/liboping0.shlibs: - Updated version to >= 1.3.0. - -- Sebastian Harl Sun, 19 Jul 2009 13:13:20 +0200 + -- Sebastian Harl Sun, 19 Jul 2009 13:15:37 +0200 liboping (0.3.5-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 1fb4dcf..0c168c4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: liboping Section: libs Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.14.6), autotools-dev, dpatch, perl-modules +Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.14.6), autotools-dev, perl-modules Standards-Version: 3.8.1 Homepage: http://verplant.org/liboping/ Vcs-Git: git://git.tokkee.org/pkg-liboping.git diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index febb817..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -static_sstrerror.dpatch - diff --git a/debian/patches/static_sstrerror.dpatch b/debian/patches/static_sstrerror.dpatch deleted file mode 100755 index 564102c..0000000 --- a/debian/patches/static_sstrerror.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## static_sstrerror.dpatch by Sebastian Harl -## -## DP: src/liboping.c: Made sstrerror() static. -## DP: -## DP: This is a private helper function only. - -@DPATCH@ - -diff a/src/liboping.c b/src/liboping.c ---- a/src/liboping.c -+++ b/src/liboping.c -@@ -145,7 +145,7 @@ struct pingobj - /* Even though Posix requires "strerror_r" to return an "int", - * some systems (e.g. the GNU libc) return a "char *" _and_ - * ignore the second argument ... -tokkee */ --char *sstrerror (int errnum, char *buf, size_t buflen) -+static char *sstrerror (int errnum, char *buf, size_t buflen) - { - buf[0] = 0; - diff --git a/debian/rules b/debian/rules index eec0a6d..5c1409c 100755 --- a/debian/rules +++ b/debian/rules @@ -19,15 +19,13 @@ else CFLAGS += -O2 endif -include /usr/share/dpatch/dpatch.make - # $srcver-$perlver-$debrev LIBPERL_VERSION := $(shell pm_ver=`perl -MExtUtils::MM -e \ 'print MM->parse_version("bindings/perl/lib/Net/Oping.pm");'`; \ pkg_ver=`dpkg-parsechangelog | egrep '^Version:' | cut -d' ' -f2`; \ echo -n "$${pkg_ver%-*}-$$pm_ver-$${pkg_ver\#\#*-}") -config.status: configure $(DPATCH_STAMPFN) +config.status: configure dh_testdir for file in config.guess config.sub; do \ @@ -52,7 +50,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp -- 2.30.2