lsb 3.2-23.1 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 46c314aa2895bf894b706066a1da1848bcbfd1cb..7e47734fbe903ee9a567b7255baa3001a289e597 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+lsb (3.2-23.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix dependencies of lsb-core on kfreebsd-* and hurd-* to make the
+    package installable. Thanks to Aurelien Jarno for the patch and the
+    bugreport.  (Closes: #539284)
+  * Set XS-Python-Version to all to make lsb-release available for all
+    supported Python versions. Thanks to Sandro Tosi for the bug report.
+    (Closes: #570586)
+  * Don't make lsb-core conflict with python (>= 2.6).
+
+ -- Jakub Wilk <jwilk@debian.org>  Sun, 21 Mar 2010 15:39:47 +0100
+
 lsb (3.2-23) unstable; urgency=low
 
   * Fix tests for $TERM in log_use_fancy_output().  (Closes: #537112, #536190)

diff --git a/debian/control b/debian/control
index 1bbdd0219cccaddccf8ffbeeee92b5a3193e0cd4..617f514c5d66d03716df2960e940d9571a7909d3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: extra
 Maintainer: Chris Lawrence <lawrencc@debian.org>
 Build-Depends: debhelper (>> 7), po-debconf (>= 0.5.0), dpkg-dev (>= 1.10), python-support, python-all-dev
 Standards-Version: 3.8.2
-XS-Python-Version: current
+XS-Python-Version: all
 Homepage: http://www.linux-foundation.org/en/LSB
 
 Package: lsb-core
 Architecture: any
 Depends: lsb-release, ${glibc}, libz1, libncurses5, libpam0g, exim4 | mail-transport-agent, at, bc, binutils, bsdmainutils, bsdutils, cpio, cron, ed, file, libc6-dev | libc-dev, locales, cups-bsd | lpr, lprng | cups-client, m4, mailx | mailutils, make, man-db, mawk | gawk, ncurses-term, passwd, patch, pax, procps, psmisc, rsync, alien (>= 8.36), ${python:Depends}, ${misc:Depends}, ${depends}, lsb-base, time
 Provides: lsb-core-noarch, ${provides}
-Conflicts: python (>= 2.6), lsb (<< 2.0-2)
+Conflicts: lsb (<< 2.0-2)
 Replaces: lsb (<< 2.0-2)
 XB-Python-Version: ${python:Versions}
 Description: Linux Standard Base 3.2 core support package

diff --git a/debian/rules b/debian/rules
index a804dbe2bb69f42e8624e8041c84c1dbcc16a47a..ad01c0faaab201f34854d76374eb543e52f63bce 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
-  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
-    DEB_HOST_ARCH_CPU := amd64
-  endif
-endif
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -g
@@ -27,7 +19,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 # Map Debian architectures to LSB architectures
-lsbarch=${DEB_HOST_ARCH_CPU}
+lsbarch=${DEB_HOST_ARCH}
 ifeq (${lsbarch}, i386)
 lsbarch=ia32
 endif
@@ -39,6 +31,12 @@ LIBC=libc6 (>> 2.3.5)
 ifeq (${lsbarch}, hurd-i386)
 LIBC=libc0.3 (>> 2.3.5)
 endif
+ifeq (${lsbarch}, kfreebsd-amd64)
+LIBC=libc0.1 (>> 2.3.5)
+endif
+ifeq (${lsbarch}, kfreebsd-i386)
+LIBC=libc0.1 (>> 2.3.5)
+endif
 ifeq (${lsbarch}, ia64)
 LIBC=libc6.1 (>> 2.3.5)
 endif
@@ -145,7 +143,8 @@ binary-arch: build install
        @echo >> debian/lsb-multimedia.substvars "provides=lsb-multimedia-${lsbarch}"
        @echo >> debian/lsb-languages.substvars "provides=lsb-languages-${lsbarch}"
        @echo >> debian/lsb-printing.substvars "provides=lsb-printing-${lsbarch}"
-       @[ ${DEB_HOST_ARCH_CPU} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=libc6-i386, lib32z1" || true
+       @[ ${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
        dh_link -a
        dh_strip -a
        dh_compress -a