From f4ddfd48cebeab7659944681c7f6c21c9cf25c92 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 9 Jun 2014 08:06:34 +0200 Subject: [PATCH] Allow multiarch alternatives of libc6-i386 and lib32z1 Thanks: Michael Biebl Closes: #748426 --- debian/rules | 4 ++-- lsb_release.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index b085272..444465b 100755 --- a/debian/rules +++ b/debian/rules @@ -84,6 +84,6 @@ override_dh_gencontrol: @echo >> debian/lsb-languages.substvars "provides=lsb-languages-${lsbarch}" @echo >> debian/lsb-printing.substvars "provides=lsb-printing-${lsbarch}" @echo >> debian/lsb-security.substvars "provides=lsb-security-${lsbarch}" - @[ ${DEB_HOST_ARCH} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=libc6-i386, lib32z1" || true - @[ ${DEB_HOST_ARCH} = 'kfreebsd-amd64' ] && echo >> debian/lsb-core.substvars "depends=libc0.1-i386, lib32z1" || true + @[ ${DEB_HOST_ARCH} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=libc6:i386 | libc6-i386, zlib1g:i386 | lib32z1" || true + @[ ${DEB_HOST_ARCH} = 'kfreebsd-amd64' ] && echo >> debian/lsb-core.substvars "depends=libc0.1:kfreebsd-i386 | libc0.1-i386, zlib1g:kfreebsd-i386 | lib32z1" || true dh_gencontrol diff --git a/lsb_release.py b/lsb_release.py index 6b9e226..ecf46e3 100644 --- a/lsb_release.py +++ b/lsb_release.py @@ -304,7 +304,6 @@ def guess_debian_release(): if release.rstrip('/sid').lower().isalpha() != 'testing': global TESTING_CODENAME TESTING_CODENAME = release.rstrip('/sid') - distinfo['CODENAME'] = TESTING_CODENAME distinfo['RELEASE'] = 'testing/unstable' else: distinfo['RELEASE'] = release -- 2.30.2