Ok, after taking a deep look at the proposed patch and soing some testing I ended up with this version which I uploaded as an NMU:
diff -Naur icon-9.4.2.bak/debian/changelog icon-9.4.2/debian/changelog --- icon-9.4.2.bak/debian/changelog 2005-08-07 02:03:58.418624408 +0200 +++ icon-9.4.2/debian/changelog 2005-08-07 02:46:33.709161200 +0200 @@ -1,3 +1,11 @@ +icon (9.4.2-2.3) unstable; urgency=low + + * Non-maintainer upload during BSP + * Update debian/rules arch/os selections to current dpkg + conventions which fixes FTBFS on linux (Closes: #316664) + + -- Frank Lichtenheld <[EMAIL PROTECTED]> Sun, 7 Aug 2005 02:46:33 +0200 + icon (9.4.2-2.2) unstable; urgency=low * Non-maintainer upload during BSP diff -Naur icon-9.4.2.bak/debian/rules icon-9.4.2/debian/rules --- icon-9.4.2.bak/debian/rules 2005-08-07 02:03:58.417624560 +0200 +++ icon-9.4.2/debian/rules 2005-08-07 03:08:08.668297488 +0200 @@ -3,43 +3,39 @@ # Do we make rt.a into an ELF library? # Do we make iconx link with xpm.so? -DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) -DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) -CFLAGS_OPT = -O2 +# Take account of old dpkg-architecture output. -ifeq "$(DEB_HOST_GNU_CPU)" "alpha" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "hppa" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "ia64" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "mips" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "mipsel" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "powerpc" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "s390" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "sparc" -CFLAGS_OPT = -O0 -endif -ifeq "$(DEB_HOST_GNU_CPU)" "x86_64" -CFLAGS_OPT = -O0 +ifeq ($(DEB_HOST_ARCH_CPU),) + DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) + ifeq ($(DEB_HOST_ARCH_CPU),x86_64) + DEB_HOST_ARCH_CPU := amd64 + endif +endif +ifeq ($(DEB_HOST_ARCH_OS),) + DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)) + ifeq ($(DEB_HOST_ARCH_OS),gnu) + DEB_HOST_ARCH_OS := hurd + endif endif -ifneq (, $(filter $(DEB_HOST_GNU_SYSTEM), linux kfreebsd-gnu knetbsd-gnu)) -system = linux +CFLAGS_OPT = -O2 + +ifneq (, $(filter $(DEB_HOST_ARCH_CPU), alpha hppa ia64 mips mipsel \ + powerpc s390 sparc amd64)) + CFLAGS_OPT = -O0 +endif + +ifneq (, $(filter $(DEB_HOST_ARCH_OS), linux kfreebsd knetbsd)) + system = linux else -system = $(DEB_HOST_GNU_SYSTEM) + ifeq ($(DEB_HOST_ARCH_OS),hurd) + system = gnu + else + system = $(DEB_HOST_ARCH_OS) + endif endif ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) Gruesse, -- Frank Lichtenheld <[EMAIL PROTECTED]> www: http://www.djpig.de/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
