From 5a4e554ae659e07108e109994ef12eaff0d2ddf0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 26 Jan 2016 09:24:59 +0100 Subject: [PATCH] MT#17517 debian: use autoreconf (cherry picked from commit 1d48f47ce398e7d954a2fa18534c6b20690b956c) --- debian/control | 3 +- debian/rules | 88 ++------------------------------------------------ 2 files changed, 5 insertions(+), 86 deletions(-) diff --git a/debian/control b/debian/control index c58c456..d3bbd60 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: ngcp-sipsak Section: net Priority: optional Maintainer: Sipwise Development Team -Build-Depends: debhelper (>= 4.0.0), +Build-Depends: debhelper (>= 9~), + dh-autoreconf, libgnutls28-dev | libgnutls-dev, libruli4-dev, pkg-config diff --git a/debian/rules b/debian/rules index 4a38336..d302666 100755 --- a/debian/rules +++ b/debian/rules @@ -1,90 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 -# 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) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --enable-timeout=150 - -build: build-stamp - -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/ngcp-sipsak - -binary-indep: build install -# We have nothing to do by default. - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --with autoreconf