From 192cef0cdd5e8a19aaca77b8f1f7806b5bc2cf5e Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sat, 19 May 2012 14:59:42 +0200 Subject: [PATCH] Use short debhelper style; migrate to multiarch. --- debian/control | 1 + debian/libfprint-dev.install | 8 +-- debian/libfprint0.install | 2 +- debian/rules | 94 ++++++------------------------------ 4 files changed, 22 insertions(+), 83 deletions(-) diff --git a/debian/control b/debian/control index ab43ef07..61c970d4 100644 --- a/debian/control +++ b/debian/control @@ -35,6 +35,7 @@ Package: libfprint0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: async fingerprint library of fprint project, shared libraries The fprint project aims to support for consumer fingerprint reader devices. . diff --git a/debian/libfprint-dev.install b/debian/libfprint-dev.install index 68a175d4..bcc93dfd 100644 --- a/debian/libfprint-dev.install +++ b/debian/libfprint-dev.install @@ -1,5 +1,5 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/lib/*.la +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* +usr/lib/*/*.la diff --git a/debian/libfprint0.install b/debian/libfprint0.install index d0dbfd18..3ddde584 100644 --- a/debian/libfprint0.install +++ b/debian/libfprint0.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/debian/rules b/debian/rules index 7e3045ea..da13cf1e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,85 +1,23 @@ #!/usr/bin/make -f -# -*- makefile -*- -# 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 +# Configuration arguments +CONFIG_ARGS = --disable-silent-rules +%: + dh $@ --parallel -# 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) - -config.status: - 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 - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-z,defs" +override_dh_auto_configure: + # From autogen.sh + libtoolize --copy --force + aclocal + autoheader + autoconf + automake -a -c + dh_auto_configure -- $(CONFIG_ARGS) - -build: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - # Remove auto* cache - rm -rf build-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - set -e; for file in `ls $(CURDIR)/debian/tmp/usr/lib/*.la`; do \ +override_dh_auto_install: + dh_auto_install + # Clear .la dependency_libs + set -e; for file in `ls $(CURDIR)/debian/tmp/usr/lib/*/*.la`; do \ sed -i "/dependency_libs/ s/'.*'/''/" $$file; \ done - - -# 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 - dh_testdir - dh_testroot - dh_installudev -n libfprint - dh_installdocs - dh_install --sourcedir=debian/tmp - dh_installman - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build binary-indep binary-arch binary install