From dc88d6f3aa1471e6e3dfa29aedaf02981a02415d Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Fri, 20 May 2011 14:40:36 +0000 Subject: [PATCH] debian: now use debhelper 7 (dh7) style rules file --- debian/control | 2 +- debian/rules | 111 ++++--------------------------------------------- 2 files changed, 10 insertions(+), 103 deletions(-) diff --git a/debian/control b/debian/control index de662e7..f8cd1ee 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libnfc Section: libs Priority: extra Maintainer: Thomas Hood -Build-Depends: debhelper (>= 7), libtool, pkg-config, libusb-dev, libpcsclite-dev +Build-Depends: debhelper (>= 7), dh-autoreconf, libtool, pkg-config, libusb-dev, libpcsclite-dev Standards-Version: 3.9.2 Homepage: http://www.libnfc.org/ diff --git a/debian/rules b/debian/rules index 56947c4..1ea7c7d 100755 --- a/debian/rules +++ b/debian/rules @@ -9,108 +9,15 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# "nocheck" option prevents from running tests (which need dedicated hardware) +export DEB_BUILD_OPTIONS=nocheck -# 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) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) - CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) - CROSS_CFLAGS=-I/usr/$(DEB_HOST_GNU_TYPE)/include -I/usr/$(DEB_HOST_GNU_TYPE)/usr/include - LDFLAGS=-L/usr/$(DEB_HOST_GNU_TYPE)/lib -L/usr/$(DEB_HOST_GNU_TYPE)/usr/lib - MAKE_LDFLAGS=-inst-prefix-dir /usr/$(DEB_HOST_GNU_TYPE) -Wl,-rpath-link /usr/$(DEB_HOST_GNU_TYPE)/lib -Wl,-rpath-link /usr/$(DEB_HOST_GNU_TYPE)/usr/lib - DH_STRIP= - DH_SHLIBDEPS= -else - CROSS= --build $(DEB_BUILD_GNU_TYPE) - DH_STRIP=dh_strip - DH_SHLIBDEPS=dh_shlibdeps -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -config.status: configure - dh_testdir - # Add here commands to configure the package. -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 - chmod ugo+x ./configure - ./configure $(CROSS) --enable-serial-autoprobe --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS) $(CROSS_CFLAGS)" LDFLAGS="-Wl,-z,defs $(LDFLAGS)" - - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) LDFLAGS="$(MAKE_LDFLAGS) $(LDFLAGS)" - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install +override_dh_installchangelogs: dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - $(DH_STRIP) - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_makeshlibs - dh_installdeb - $(DH_SHLIBDEPS) - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_configure: + dh_auto_configure -- --enable-serial-autoprobe +# dh_auto_configure -- --enable-debug --with-drivers=all --enable-serial-autoprobe + +%: + dh --with autoreconf $@