From 89e2ebb695e977d8f12dc6cdc7c441662154e8e2 Mon Sep 17 00:00:00 2001 From: Arnd Hannemann Date: Thu, 16 Jan 2014 11:28:36 +0100 Subject: [PATCH] debian: drop cdbs as buildhelper, use dh_* instead --- debian/control | 4 ++-- debian/flowgrind-doc.docs | 1 - debian/flowgrind-doc.install | 1 - debian/rules | 10 +++++----- 4 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 debian/flowgrind-doc.docs delete mode 100644 debian/flowgrind-doc.install diff --git a/debian/control b/debian/control index f6eba225..bb400623 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: flowgrind Section: net Priority: extra Maintainer: Christian Samsel -Build-Depends: debhelper (>= 7), cdbs, autotools-dev, libxmlrpc-c3-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev, libgsl0-dev, libpcap-dev +Build-Depends: debhelper (>= 7), autotools-dev, libxmlrpc-c3-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev, libgsl0-dev, libpcap-dev Standards-Version: 3.9.4 Homepage: http://launchpad.net/flowgrind/ Vcs-Git: git://github.com/flowgrind/flowgrind.git @@ -18,7 +18,7 @@ Description: Distributed network performance measurement tool is used to schedule flows between and collect live samples from nodes running the flowgrindd daemon. Features: - * Measure bandwith, delay, IAT and sample TCP kernel metrics (tcp_info) + * Measure bandwidth, delay, IAT and sample TCP kernel metrics (tcp_info) * Bulk transfers, rate-limited flows, sophisticated request/response test * Report observed MSS/MTU size * Set buffer size on per flow basis diff --git a/debian/flowgrind-doc.docs b/debian/flowgrind-doc.docs deleted file mode 100644 index d4f45425..00000000 --- a/debian/flowgrind-doc.docs +++ /dev/null @@ -1 +0,0 @@ -#DOCS# diff --git a/debian/flowgrind-doc.install b/debian/flowgrind-doc.install deleted file mode 100644 index d4f45425..00000000 --- a/debian/flowgrind-doc.install +++ /dev/null @@ -1 +0,0 @@ -#DOCS# diff --git a/debian/rules b/debian/rules index 04ee2e5e..61e4b585 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,8 @@ #!/usr/bin/make -f -# Using CDBS for packaging +%: + dh $@ -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk - -DEB_DESTDIR = $(CURDIR)/debian/flowgrind +# tell dh_strip that our debugging package is named flowgrind-dbg +override_dh_strip: + dh_strip --dbg-package=flowgrind-dbg