Change build system to dh

diff --git a/debian/changelog b/debian/changelog
index 26cda77210899ba7bcc0abaed281bc1e451d4eb6..4d370243a950c78243d1e1a0b928f87c834ef07f 100644 (file)
--- 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 <tfheen@debian.org>  Thu, 28 Apr 2011 22:41:02 +0200
 

diff --git a/debian/control b/debian/control
index f56998e535ea6253e66d8d31d249269b14493db1..3babae38f63aa6999a51926f2c62e8ca681f597d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: yubikey-personalization
 Section: utils
 Priority: extra
 Maintainer: Tollef Fog Heen <tfheen@debian.org>
-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 0b69e60e3cd26962cc7740636d52b020c88c622a..6f1b0222ced3e625cd2fdc49cfa99ac814c055b5 100755 (executable)
--- 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