Allow multiarch alternatives of libc6-i386 and lib32z1

Thanks: Michael Biebl
Closes: #748426

diff --git a/debian/rules b/debian/rules
index b085272cb99afda4b843b5456208fd92d424acd3..444465bd54a7a46279007d162c1683eb4d7418e0 100755 (executable)
--- 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 6b9e226b6143897e63449ab41e369dd7ece7464e..ecf46e3ebbcf6b67aae5e2e226d3ba5a6df369cf 100644 (file)
--- 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