From 70a75382ce664a0b70204339a2a835f6abd0a605 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 20 Feb 2025 20:13:16 +0100 Subject: [PATCH] Dropping conditional multiarch support for pre-wheezy. Signed-off-by: Daniel Baumann --- debian/control | 2 +- debian/liblz-dev.install | 12 ++---------- debian/liblz1.install | 10 +--------- debian/rules | 14 -------------- 4 files changed, 4 insertions(+), 34 deletions(-) mode change 100755 => 100644 debian/liblz-dev.install mode change 100755 => 100644 debian/liblz1.install diff --git a/debian/control b/debian/control index 7ce5669..41cdb49 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://www.nongnu.org/lzip/lzlib.html Package: liblz1 Section: libs Architecture: any -Pre-Depends: ${multiarch:Pre-Depends} +Pre-Depends: multiarch-support Depends: ${misc:Depends}, ${shlibs:Depends} Description: data compressor based on the LZMA algorithm (library) The lzlib compression library provides in-memory LZMA compression and diff --git a/debian/liblz-dev.install b/debian/liblz-dev.install old mode 100755 new mode 100644 index a82be7b..2f05691 --- a/debian/liblz-dev.install +++ b/debian/liblz-dev.install @@ -1,12 +1,4 @@ -#!/bin/sh - -set -e - -DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" - -cat << EOF usr/include -usr/lib/${DEB_HOST_MULTIARCH}/*.a -usr/lib/${DEB_HOST_MULTIARCH}/*.so +usr/lib/*/*.a +usr/lib/*/*.so usr/share/info -EOF diff --git a/debian/liblz1.install b/debian/liblz1.install old mode 100755 new mode 100644 index 68a9cf4..3de3b10 --- a/debian/liblz1.install +++ b/debian/liblz1.install @@ -1,9 +1 @@ -#!/bin/sh - -set -e - -DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" - -cat << EOF -usr/lib/${DEB_HOST_MULTIARCH}/*.so.* -EOF +usr/lib/*/*.so.* diff --git a/debian/rules b/debian/rules index 9dcfcaa..ec38878 100755 --- a/debian/rules +++ b/debian/rules @@ -11,26 +11,12 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install -- LDCONFIG=/bin/true - # adding missing symlink -ifeq ($(DEB_HOST_MULTIARCH),) - ln -s liblz.so.1.1 debian/tmp/usr/lib/liblz.so -else - ln -s liblz.so.1.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liblz.so -endif - # removing unused files rm -f debian/tmp/usr/share/info/dir* override_dh_builddeb: dh_builddeb -- -Zxz -z9 -override_dh_gencontrol: -ifeq ($(DEB_HOST_MULTIARCH),) - dh_gencontrol -else - dh_gencontrol -- -Vmultiarch:Pre-Depends="multiarch-support" -endif - override_dh_install: dh_install --fail-missing