diff -pruN 1.63-6/admin/config.guess 1.63-6ubuntu1/admin/config.guess --- 1.63-6/admin/config.guess 2010-01-29 11:34:05.000000000 +0000 +++ 1.63-6ubuntu1/admin/config.guess 2010-01-29 11:31:57.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ + | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -656,7 +656,7 @@ EOF # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -822,9 +822,6 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -885,17 +882,40 @@ EOF m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:* | mips64:Linux:*:*) + mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + CPU=mipsel #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 #else CPU= #endif @@ -927,7 +947,7 @@ EOF EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep -q ld.so.1 + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; @@ -981,6 +1001,14 @@ EOF elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1046,7 +1074,7 @@ EOF i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1154,7 +1182,7 @@ EOF rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) diff -pruN 1.63-6/admin/config.sub 1.63-6ubuntu1/admin/config.sub --- 1.63-6/admin/config.sub 2010-01-29 11:34:05.000000000 +0000 +++ 1.63-6ubuntu1/admin/config.sub 2010-01-29 11:31:57.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -153,9 +153,6 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk - ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -470,10 +467,6 @@ case $basic_machine in basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; c90) basic_machine=c90-cray os=-unicos @@ -1267,7 +1260,7 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1620,7 +1613,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -cnk*|-aix*) + -aix*) vendor=ibm ;; -beos*) diff -pruN 1.63-6/debian/changelog 1.63-6ubuntu1/debian/changelog --- 1.63-6/debian/changelog 2010-01-29 11:34:05.000000000 +0000 +++ 1.63-6ubuntu1/debian/changelog 2010-01-29 11:31:57.000000000 +0000 @@ -1,3 +1,11 @@ +klogic (1.63-6ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/rules: added --without-arts parameter to configure script call to + rebuild without arts support + + -- Andreas Wenning Fri, 29 Jan 2010 09:24:33 +0100 + klogic (1.63-6) unstable; urgency=low * Fix FTBFS with GCC 4.4 and eglibc 2.10, thanks Simon Olofsson @@ -9,6 +17,20 @@ klogic (1.63-6) unstable; urgency=low -- Chris Boyle Sat, 28 Nov 2009 12:43:27 +0000 +klogic (1.63-5ubuntu2) karmic; urgency=low + + * Fix FTBFS with GCC 4.4 and eglibc 2.10 (LP: #461300). + + -- Simon Olofsson Mon, 26 Oct 2009 19:00:57 +0100 + +klogic (1.63-5ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #384331): + - debian/rules: added --without-arts parameter to configure script call to + rebuild without arts support + + -- Nick Ellery Sat, 06 Jun 2009 11:00:59 -0700 + klogic (1.63-5) unstable; urgency=low * Move DH_COMPAT into debian/compat. @@ -32,6 +54,13 @@ klogic (1.63-4) unstable; urgency=low -- Chris Boyle Sun, 24 May 2009 14:25:01 +0100 +klogic (1.63-3ubuntu1) jaunty; urgency=low + + * debian/rules: added --without-arts parameter to configure script call to + rebuild without arts support (LP: #320915) + + -- Fabrice Coutadeur Sat, 18 Apr 2009 05:02:07 +0000 + klogic (1.63-3) unstable; urgency=low * Fix .desktop and icon locations as in Ubuntu, oops, thanks William diff -pruN 1.63-6/debian/control 1.63-6ubuntu1/debian/control --- 1.63-6/debian/control 2010-01-29 11:34:05.000000000 +0000 +++ 1.63-6ubuntu1/debian/control 2010-01-29 11:31:57.000000000 +0000 @@ -1,7 +1,8 @@ Source: klogic Section: electronics Priority: optional -Maintainer: Chris Boyle +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Chris Boyle Build-Depends: debhelper (>= 7), kdelibs4-dev (>= 4:3.1.2-2), docbook-to-man, autotools-dev, chrpath Standards-Version: 3.8.3.0 Homepage: http://www.a-rostin.de/ diff -pruN 1.63-6/debian/rules 1.63-6ubuntu1/debian/rules --- 1.63-6/debian/rules 2010-01-29 11:34:05.000000000 +0000 +++ 1.63-6ubuntu1/debian/rules 2010-01-29 11:31:57.000000000 +0000 @@ -16,7 +16,7 @@ configure-stamp: dh_testdir # configure the package $(COMPILER_FLAGS) \ - ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --without-arts touch configure-stamp