From 0e6f9c46bb9b7fa479f2b09159577b2618a2ea38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Apr 2016 08:44:49 +0200 Subject: move empty dependency_libs in all .la files to override_dh_makeshlibs-arch --- debian/changelog | 7 +++++-- debian/libsane-bin.lintian-overrides | 1 + debian/rules | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 debian/libsane-bin.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 00a4d13..09974c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ sane-backends (1.0.25-3) UNRELEASED; urgency=low - Add a timeout to prevent "Resource temporarily unavailable" error (Closes: #810919). Thanks to Steve Graham . - * debian/rules: Split rules into *-arch and *-indep to - prevent build errors (Closes: #806104). + * debian/rules: + - Split rules into *-arch and *-indep to prevent build errors + (Closes: #806104). + - To prevent lintian errors move Empty dependency_libs in all .la + files to override_dh_makeshlibs-arch. * debian/watch: - bump version to 4 (no changes required). * debian/control: diff --git a/debian/libsane-bin.lintian-overrides b/debian/libsane-bin.lintian-overrides new file mode 100644 index 0000000..f254352 --- /dev/null +++ b/debian/libsane-bin.lintian-overrides @@ -0,0 +1 @@ +old-style-config-script-multiarch-path \ No newline at end of file diff --git a/debian/rules b/debian/rules index 9bfe309..5d684de 100755 --- a/debian/rules +++ b/debian/rules @@ -78,7 +78,7 @@ override_dh_auto_install-arch: test -e debian/tmp/$$mp && echo $$mp >> debian/libsane-common.install; done } # Empty dependency_libs in all .la files find debian/tmp/usr -name "*.la" -type f -exec sed -e "s,^dependency_libs=.*,dependency_libs=''," -i {} \; - + find debian -name "*.la" -type f -exec sed -i "/dependency_libs/ s/'.*'/''/" -i {} \; override_dh_install-arch: dh_install @@ -138,3 +138,6 @@ override_dh_strip-arch: override_dh_makeshlibs-arch: dh_makeshlibs -- -v$(VERSION) -Pdebian/libsane -plibsane + # Empty dependency_libs in all .la files + find debian/tmp/usr -name "*.la" -type f -exec sed -e "s,^dependency_libs=.*,dependency_libs=''," -i {} \; + find debian -name "*.la" -type f -exec sed -i "/dependency_libs/ s/'.*'/''/" -i {} \; -- cgit v1.2.3