From e5987ce99e06cfc34d0701f8d5332dab6b7a3195 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 28 Apr 2011 22:47:57 +0200 Subject: [PATCH] Change build system to dh --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 83 +++--------------------------------------------- 3 files changed, 6 insertions(+), 80 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26cda77..4d37024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ yubikey-personalization (1.5.1-1) unstable; urgency=low * Add udev rules to grant the console user access to the usbdevfs device node in order to both program USB tokens and use the challenge/response functionality. + * Change build system to dh. -- Tollef Fog Heen Thu, 28 Apr 2011 22:41:02 +0200 diff --git a/debian/control b/debian/control index f56998e..3babae3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: yubikey-personalization Section: utils Priority: extra Maintainer: Tollef Fog Heen -Build-Depends: debhelper (>= 7), autotools-dev, libusb-1.0-0-dev, libyubikey-dev(>= 1.5), chrpath, pkg-config +Build-Depends: debhelper (>= 7.0.50), autotools-dev, libusb-1.0-0-dev, libyubikey-dev(>= 1.5), chrpath, pkg-config, dh-autoreconf Standards-Version: 3.8.2 Homepage: http://code.google.com/p/yubikey-personalization/ diff --git a/debian/rules b/debian/rules index 0b69e60..6f1b022 100755 --- a/debian/rules +++ b/debian/rules @@ -1,86 +1,11 @@ #! /usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. #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) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif +%: + dh $@ --parallel --with autoreconf --builddirectory=build -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 - mkdir -p build-$(DEB_BUILD_GNU_TYPE) - cd build-$(DEB_BUILD_GNU_TYPE) && ../configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" || sleep 6000 - -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) -C build-$(DEB_BUILD_GNU_TYPE) - 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 -rf build-$(DEB_BUILD_GNU_TYPE) - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) -C build-$(DEB_BUILD_GNU_TYPE) DESTDIR=$(CURDIR)/debian/tmp install +override_dh_install: chrpath -d $(CURDIR)/debian/tmp/usr/bin/ykpersonalize - -# Build architecture-independent files here. -binary-indep: install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples rm -rf debian/tmp/usr/lib/*.la - dh_install --sourcedir=debian/tmp --fail-missing - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs -V - 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_install --builddirectory=build --fail-missing -- 2.39.5