From 98d3045da33239edc2e06fcee100bd306615f614 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Thu, 21 Jun 2018 13:17:11 +0200 Subject: [PATCH] Switch to meson, the static library is not built anymore --- debian/changelog | 3 ++- debian/control | 2 +- debian/libfprint-dev.install | 2 -- debian/rules | 9 +-------- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 001d3a1b..2ec9887c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ libfprint (1:0.8.1-1) UNRELEASED; urgency=medium * New upstream release + - Switch to meson, the static library is not built anymore - Fix security hole by zero out memory when allocated (Closes: #890827) - d/p/kFreeBSD_FTBFS_add_ETIME_definition.patch: Updated - d/p/use-non-versionned-libusbh-path.patch: Updated * debian/watch: Update the watch file to point to the freedesktop gitlab release page - -- Laurent Bigonville Thu, 21 Jun 2018 13:14:14 +0200 + -- Laurent Bigonville Thu, 21 Jun 2018 13:16:54 +0200 libfprint (1:0.7.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 18871d0c..63f45e0b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: FingerForce Team Uploaders: Ulises Vitulli , Didier Raboud Build-Depends: debhelper (>= 10), libusb-1.0-0-dev, libglib2.0-dev, libpixman-1-dev, libxv-dev, - libnss3-dev + libnss3-dev, meson Standards-Version: 3.9.8 Homepage: https://www.freedesktop.org/wiki/Software/fprint/libfprint Vcs-Browser: https://anonscm.debian.org/gitweb/?p=fingerforce/libfprint.git diff --git a/debian/libfprint-dev.install b/debian/libfprint-dev.install index bcc93dfd..7df81cd9 100644 --- a/debian/libfprint-dev.install +++ b/debian/libfprint-dev.install @@ -1,5 +1,3 @@ usr/include/* -usr/lib/*/lib*.a usr/lib/*/lib*.so usr/lib/*/pkgconfig/* -usr/lib/*/*.la diff --git a/debian/rules b/debian/rules index 2abc5086..01f12f75 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # Configuration arguments -CONFIG_ARGS = --disable-silent-rules +CONFIG_ARGS = -Dudev_rules_dir=/lib/udev/rules.d %: dh $@ --parallel @@ -13,13 +13,6 @@ override_dh_clean: override_dh_auto_configure: dh_auto_configure -- $(CONFIG_ARGS) -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 - override_dh_installudev: cp libfprint/60-fprint-autosuspend.rules debian/libfprint0.udev dh_installudev