diff -pruN 0.73.beta-4/admin/acinclude.m4.in 0.73.beta-4ubuntu4/admin/acinclude.m4.in
--- 0.73.beta-4/admin/acinclude.m4.in	2003-03-06 20:31:56.000000000 +0000
+++ 0.73.beta-4ubuntu4/admin/acinclude.m4.in	2010-03-09 18:56:04.000000000 +0000
@@ -513,7 +513,11 @@ Please check whether you installed KDE c
 
 AC_DEFUN(KDE_SUBST_PROGRAMS,
 [
-
+    AC_ARG_WITH(arts,
+        [  --without-arts        build without aRts [default=detect] ],
+        [build_arts=$withval],
+        [build_arts=yes]
+    )
         kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
         if test -n "$KDEDIRS"; then
            kde_save_IFS=$IFS
@@ -526,8 +530,10 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
+        if test "$build_arts" != "no"; then
+          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(mcopidl)])
+          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(artsc-config)])
+        fi
         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
       
diff -pruN 0.73.beta-4/admin/configure.in.min 0.73.beta-4ubuntu4/admin/configure.in.min
--- 0.73.beta-4/admin/configure.in.min	2003-03-06 20:31:56.000000000 +0000
+++ 0.73.beta-4ubuntu4/admin/configure.in.min	2010-03-09 18:56:04.000000000 +0000
@@ -44,6 +44,9 @@ dnl generate the config header
 AM_CONFIG_HEADER(config.h) dnl at the distribution this done
 
 dnl Checks for programs.
+AC_PROG_CXX
+AC_OBJEXT
+AC_EXEEXT
 AC_CHECK_COMPILERS
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
diff -pruN 0.73.beta-4/config.guess 0.73.beta-4ubuntu4/config.guess
--- 0.73.beta-4/config.guess	2010-03-09 19:02:31.000000000 +0000
+++ 0.73.beta-4ubuntu4/config.guess	2010-03-09 18:56:04.000000000 +0000
@@ -1,9 +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 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2005-08-03'
+timestamp='2009-06-10'
 
 # 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
@@ -55,8 +56,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -168,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 __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -206,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -319,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -527,7 +548,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -635,7 +656,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -764,12 +785,19 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -779,12 +807,24 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd | genuineintel)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [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
@@ -815,6 +855,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -835,42 +885,27 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	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; }
 	;;
     or32:Linux:*:*)
@@ -892,10 +927,13 @@ EOF
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -919,9 +957,15 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -937,17 +981,6 @@ EOF
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		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
@@ -964,7 +997,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -974,7 +1007,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1009,7 +1046,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1053,8 +1090,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1092,6 +1132,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1104,7 +1154,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1167,6 +1217,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1176,6 +1229,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1185,7 +1247,6 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1325,12 @@ EOF
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1424,9 +1491,9 @@ This script, last modified $timestamp, h
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -pruN 0.73.beta-4/config.sub 0.73.beta-4ubuntu4/config.sub
--- 0.73.beta-4/config.sub	2010-03-09 19:02:31.000000000 +0000
+++ 0.73.beta-4ubuntu4/config.sub	2010-03-09 18:56:04.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -71,8 +72,8 @@ Report bugs and patches to <config-patch
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -119,8 +120,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -150,6 +153,9 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -171,6 +177,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +197,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,20 +245,24 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -257,26 +275,26 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m32c)
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -286,6 +304,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -305,25 +326,28 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -336,30 +360,33 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
-	m32c-*)
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -423,6 +450,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -431,10 +462,26 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -463,8 +510,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -502,6 +549,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -656,6 +707,14 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -671,6 +730,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -696,6 +759,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -794,6 +860,14 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -803,6 +877,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +939,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +969,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -896,6 +984,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -985,6 +1076,10 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1060,6 +1155,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1098,10 +1197,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1168,27 +1267,30 @@ 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* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1318,6 +1420,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1340,6 +1445,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1349,9 +1460,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1377,6 +1488,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1506,7 +1620,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff -pruN 0.73.beta-4/debian/changelog 0.73.beta-4ubuntu4/debian/changelog
--- 0.73.beta-4/debian/changelog	2010-03-09 19:02:31.000000000 +0000
+++ 0.73.beta-4ubuntu4/debian/changelog	2010-03-09 18:56:04.000000000 +0000
@@ -1,9 +1,59 @@
+komba2 (0.73.beta-4ubuntu4) lucid; urgency=low
+
+  * Fix FTBFS:
+    - debian/rules: call ./configure with --without-arts and regenerate 
+      it prior to calling
+    - for this, add build dependencies on autoconf and automake
+    - admin/acinclude.m4.in: patch build system to support 
+      --without-arts argument to ./configure, adapted from 
+      http://websvn.kde.org/?view=revision&revision=214081
+    - admin/configure.in.min: add necessary macros
+
+ -- Ilya Barygin <barygin@gmail.com>  Tue, 09 Mar 2010 18:51:25 +0300
+
+komba2 (0.73.beta-4ubuntu3) hardy; urgency=low
+
+  * Replace dh_iconcache with dh_icons and build-depend on debhelper
+    >= 5.0.51 (for dh_icons).
+  * Build without libqt3-compat-headers. Thanks to Barry deFreese for the
+    patch (Closes: #464643).
+  * Fix the following lintian warnings:
+    + debian-rules-sets-DH_COMPAT
+    + debian-rules-ignores-make-clean-error
+
+ -- Michael Bienia <geser@ubuntu.com>  Sun, 09 Mar 2008 14:48:43 +0100
+
+komba2 (0.73.beta-4ubuntu2) gutsy; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 15 Aug 2007 08:06:52 +0000
+
+komba2 (0.73.beta-4ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu,  6 Jul 2006 13:48:20 +1000
+
 komba2 (0.73.beta-4) unstable; urgency=low
 
   * Accept NMU from Luk Claes.
 
  -- Jean-Michel Kelbert <kelbert@debian.org>  Fri, 20 Jan 2006 23:47:30 +0100
 
+komba2 (0.73.beta-3.1ubuntu1) dapper; urgency=low
+
+  * Added dh_iconcache
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 13 May 2006 20:53:12 +1000
+
+komba2 (0.73.beta-3.1build1) dapper; urgency=low
+
+  * Rebuild KDE universe for libstdc++ transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Dec 2005 16:24:48 +0000
+
 komba2 (0.73.beta-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -132,3 +182,4 @@ komba2 (0.71-1) unstable; urgency=low
 Local variables:
 mode: debian-changelog
 End:
+
diff -pruN 0.73.beta-4/debian/compat 0.73.beta-4ubuntu4/debian/compat
--- 0.73.beta-4/debian/compat	1970-01-01 01:00:00.000000000 +0100
+++ 0.73.beta-4ubuntu4/debian/compat	2010-03-09 18:56:04.000000000 +0000
@@ -0,0 +1 @@
+4
diff -pruN 0.73.beta-4/debian/control 0.73.beta-4ubuntu4/debian/control
--- 0.73.beta-4/debian/control	2010-03-09 19:02:31.000000000 +0000
+++ 0.73.beta-4ubuntu4/debian/control	2010-03-09 18:56:04.000000000 +0000
@@ -1,8 +1,9 @@
 Source: komba2
 Section: net
 Priority: optional
-Maintainer: Jean-Michel Kelbert <kelbert@debian.org>
-Build-Depends: debhelper (>> 3.0.0), kdelibs4-dev, libqt3-compat-headers, autotools-dev
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jean-Michel Kelbert <kelbert@debian.org>
+Build-Depends: debhelper (>= 5.0.51), kdelibs4-dev, autotools-dev, autoconf, automake
 Standards-Version: 3.5.8
 
 Package: komba2
diff -pruN 0.73.beta-4/debian/rules 0.73.beta-4ubuntu4/debian/rules
--- 0.73.beta-4/debian/rules	2010-03-09 19:02:31.000000000 +0000
+++ 0.73.beta-4ubuntu4/debian/rules	2010-03-09 18:56:04.000000000 +0000
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -36,7 +33,8 @@ config.status: configure
 		touch -d "Jan 01 2003" $$i; \
 	done
 
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --with-qt-includes=/usr/include/qt3/
+	$(MAKE) -f admin/Makefile.common
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --with-qt-includes=/usr/include/qt3/ --without-arts
 
 
 build: build-stamp
@@ -62,7 +60,7 @@ clean:
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -112,6 +110,7 @@ binary-arch: build install
 	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs ChangeLog
+	dh_icons
 	dh_link
 	dh_strip
 	dh_compress -a -X.docbook -X.css -X-license -X.dcl -X.bz2
diff -pruN 0.73.beta-4/komba2/debugoutput.h 0.73.beta-4ubuntu4/komba2/debugoutput.h
--- 0.73.beta-4/komba2/debugoutput.h	2003-03-06 20:31:56.000000000 +0000
+++ 0.73.beta-4ubuntu4/komba2/debugoutput.h	2010-03-09 18:56:04.000000000 +0000
@@ -19,7 +19,7 @@
 #define DEBUGOUTPUT_H
 
 #include <qwidget.h>
-#include <qmultilinedit.h>
+#include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <DebugOutputDlg.h>
 #include <qdialog.h>
diff -pruN 0.73.beta-4/po/de.po 0.73.beta-4ubuntu4/po/de.po
--- 0.73.beta-4/po/de.po	2010-03-09 19:02:31.000000000 +0000
+++ 0.73.beta-4ubuntu4/po/de.po	2010-03-09 18:56:04.000000000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-01 23:30+0100\n"
+"POT-Creation-Date: 2001-03-01 23:31+0100\n"
 "PO-Revision-Date: 2001-02-20 18:45GMT\n"
 "Last-Translator: Frank Schwanz <schwanz@fh-brandenburg.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -253,8 +253,7 @@ msgstr "IP-Bereich"
 
 #: PrefDlg.cpp:192
 msgid "Here you can insert a range of ip's you want to scan."
-msgstr ""
-"Hier können Sie Bereich von IP's angeben die durchsucht werden sollen."
+msgstr "Hier können Sie Bereich von IP's angeben die durchsucht werden sollen."
 
 #: PrefDlg.cpp:196
 msgid "A&ppend"
@@ -438,8 +437,7 @@ msgstr "sichern ist standard"
 #, fuzzy
 msgid "It makes the option \"save\" in accountdialog checked by default"
 msgstr ""
-"Dies macht die Option \"sichern\" im Passwortdialog standardmäßig "
-"ausgewählt"
+"Dies macht die Option \"sichern\" im Passwortdialog standardmäßig ausgewählt"
 
 #: PrefDlg.cpp:395
 msgid "Scan/Mount"
@@ -532,8 +530,8 @@ msgstr "sichern"
 #: PasswordDlg.cpp:109
 msgid "If it is checked the password will be stored in configfile."
 msgstr ""
-"Wenn diese Option gewählt wurde wird das Passwort in der "
-"Konfigurationsdatei gespeichert."
+"Wenn diese Option gewählt wurde wird das Passwort in der Konfigurationsdatei "
+"gespeichert."
 
 #: MessageDlg.moc.cpp:43 MessageDlg.moc.cpp:48
 msgid "MessageDlg"
diff -pruN 0.73.beta-4/po/it.po 0.73.beta-4ubuntu4/po/it.po
--- 0.73.beta-4/po/it.po	2003-03-06 20:31:55.000000000 +0000
+++ 0.73.beta-4ubuntu4/po/it.po	2010-03-09 18:56:04.000000000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-01 23:30+0100\n"
+"POT-Creation-Date: 2001-03-01 23:31+0100\n"
 "PO-Revision-Date: 2001-03-11 17:02+0100\n"
 "Last-Translator: Filippo Maguolo <maguolo@cs.unibo.it>\n"
 "Language-Team: Italiano <kde-i18n-it@master.kde.org>\n"
@@ -381,7 +381,8 @@ msgstr "mostra stampanti"
 
 #: PrefDlg.cpp:356
 msgid "No printer support is implemented but you can see the printers"
-msgstr "Non è implementato nessun supporto per stampanti, ma puoi vederle lo stesso"
+msgstr ""
+"Non è implementato nessun supporto per stampanti, ma puoi vederle lo stesso"
 
 #: PrefDlg.cpp:360
 msgid "samba"
@@ -405,7 +406,8 @@ msgstr "scandisci ogni computer che verr
 
 #: PrefDlg.cpp:380
 msgid "If you have many computers in your network scan will need a long time"
-msgstr "Se hai molti computer nella tua rete la scansione impiegherà molto tempo"
+msgstr ""
+"Se hai molti computer nella tua rete la scansione impiegherà molto tempo"
 
 #: PrefDlg.cpp:384
 msgid "no password dialog"
@@ -425,7 +427,8 @@ msgstr "salva come predefinito"
 
 #: PrefDlg.cpp:394
 msgid "It makes the option \"save\" in accountdialog checked by default"
-msgstr "Spunta come predefinita l'opzione \"salva password\" nel dialog di account"
+msgstr ""
+"Spunta come predefinita l'opzione \"salva password\" nel dialog di account"
 
 #: PrefDlg.cpp:395
 msgid "Scan/Mount"
@@ -521,7 +524,8 @@ msgstr "salva"
 
 #: PasswordDlg.cpp:109
 msgid "If it is checked the password will be stored in configfile."
-msgstr "Se questo è spuntato la password sarà memorizzata nel file di configurazione."
+msgstr ""
+"Se questo è spuntato la password sarà memorizzata nel file di configurazione."
 
 #: MessageDlg.moc.cpp:43 MessageDlg.moc.cpp:48
 msgid "MessageDlg"
@@ -822,4 +826,3 @@ msgstr "Nome"
 #: InfoTabDlg.cpp:579
 msgid "Search"
 msgstr "Cerca"
-
diff -pruN 0.73.beta-4/po/komba2.pot 0.73.beta-4ubuntu4/po/komba2.pot
--- 0.73.beta-4/po/komba2.pot	2003-03-06 20:31:55.000000000 +0000
+++ 0.73.beta-4ubuntu4/po/komba2.pot	2010-03-09 18:56:04.000000000 +0000
@@ -444,13 +444,13 @@ msgstr ""
 msgid "DebugOutput"
 msgstr ""
 
-#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
+#: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 
-#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
+#: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
diff -pruN 0.73.beta-4/po/pt_BR.po 0.73.beta-4ubuntu4/po/pt_BR.po
--- 0.73.beta-4/po/pt_BR.po	2003-03-06 20:31:55.000000000 +0000
+++ 0.73.beta-4ubuntu4/po/pt_BR.po	2010-03-09 18:56:04.000000000 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-02 10:45-0300\n"
+"POT-Creation-Date: 2001-03-01 23:31+0100\n"
 "PO-Revision-Date: 2001-03-05 14:29+GMT\n"
 "Last-Translator: Marcelo Vanzin <vanza@rededc.com.br>\n"
 "Language-Team: Portuguese (Brazilian) <de@li.org>\n"
@@ -14,130 +14,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: komba2doc.cpp:93 komba2view.cpp:47 komba2view.cpp:57 komba2view.cpp:281
-msgid "Network"
-msgstr "Rede"
-
-#: komba2view.cpp:58
-msgid "IP"
-msgstr "IP"
-
-#: komba2view.cpp:59
-msgid "Comment"
-msgstr "Comentário"
-
-#: komba2view.cpp:170
-msgid "Samba-Network"
-msgstr "Rede Samba"
-
-#: komba2view.cpp:173
-msgid "Master : "
-msgstr "Master : "
-
-#: komba2view.cpp:179 komba2view.cpp:189
-msgid "Comment : "
-msgstr "Comentário : "
-
-#: komba2view.cpp:185
-msgid "Mountpath : "
-msgstr "Local de montagem : "
-
-#: komba2doc.cpp:755 komba2view.cpp:259
-msgid "Choose a mountpath"
-msgstr "Escolha um local de montagem"
-
-#: komba2view.cpp:318 password.cpp:63
-msgid "Workgroup"
-msgstr "Grupo de trabalho"
-
-#: komba2view.cpp:348 password.cpp:65
-msgid "Host"
-msgstr "Host"
+#: komba2.cpp:79 unmount.moc.cpp:42 unmount.moc.cpp:47
+msgid "Unmount"
+msgstr "Desmontar"
 
-#: komba2view.cpp:354 komba2view.cpp:379
-msgid "unknown"
-msgstr "desconhecido"
+#: password.moc.cpp:42 password.moc.cpp:47
+#, fuzzy
+msgid "thePassword"
+msgstr "Senha de compartilhamento"
 
-#: komba2view.cpp:364 password.cpp:67
-msgid "Share"
-msgstr "Compartilhamento"
+#: komba2.cpp:71
+msgid "New &Window"
+msgstr "Nova &Janela"
 
-#: komba2view.cpp:370
-msgid "Disk"
-msgstr "Disco"
+#: komba2.cpp:73
+msgid "Recent mounts"
+msgstr "Montagens recentes"
 
-#: komba2view.cpp:373
-msgid "Printer"
-msgstr "Impressora"
+#: komba2.cpp:76
+msgid "Configure"
+msgstr "Configurar"
 
-#: komba2view.cpp:376
-msgid "IPC$"
-msgstr "IPC$"
+#: komba2.cpp:77 mount.moc.cpp:42 mount.moc.cpp:47
+msgid "Mount"
+msgstr "Montar"
 
-#: main.cpp:9 main.cpp:23
-msgid "Komba2"
-msgstr "Komba2"
+#: komba2.cpp:78
+msgid "Mount on ..."
+msgstr "Montar em..."
 
-#: main.cpp:15
-msgid "file to open"
-msgstr "arquivo a abrir"
+#: komba2.cpp:80 komba2.cpp:81 komba2.cpp:82 komba2.cpp:83
+msgid "Set password"
+msgstr "Configura senha"
 
 #: komba2.cpp:84 komba2.cpp:85 komba2.cpp:86 komba2.cpp:87 message.cpp:24
 #: message.cpp:32
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
+#: komba2.cpp:91
+msgid "Explore"
+msgstr "Explorar"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
+#: komba2.cpp:93 ping.moc.cpp:42 ping.moc.cpp:47
+msgid "Ping"
+msgstr "Ping"
 
-#: preferences.cpp:135
-msgid "Choose a prefered mountpath"
-msgstr "Escolhe um local de montagem preferido"
+#: komba2.cpp:94
+msgid "Traceroute"
+msgstr "Traceroute"
 
-#: preferences.cpp:143
-msgid "You must select a path ! Please try again. "
-msgstr "Você deve escolher um local! Tente novamente. "
+#: komba2.cpp:96
+msgid "Deletes all items in it and rescan"
+msgstr "Apagar todos os ítens e reler"
 
-#: preferences.cpp:144
-msgid "Mountpath not correct"
-msgstr "Caminho incorreto"
+#: komba2.cpp:98
+msgid "Mount a recently mounted share"
+msgstr "Monta um compartilhamento montado recentemente"
 
-#: preferences.cpp:180
-msgid "The from-IP is bigger than the to-IP."
-msgstr "O IP \"de\" é maior que o IP \"até\"."
+#: komba2.cpp:99
+msgid "Opens a new application window"
+msgstr "Abre uma nova janela do aplicativo"
 
-#: preferences.cpp:181 preferences.cpp:189 preferences.cpp:196
-msgid "Not correct IP"
-msgstr "IP incorreto"
+#: komba2.cpp:100
+msgid "Quits the application"
+msgstr "Sai do programa"
 
-#: preferences.cpp:188 preferences.cpp:195
-msgid "This is'nt an IP-Address. Please try again. "
-msgstr "Isto não é um endereço IP. Tente novamente. "
+#: komba2.cpp:101
+msgid "Enables/disables the toolbar"
+msgstr "Habilita/disabilita a barra de ferramentas"
 
-#: preferences.cpp:227
-msgid "You must set the workgroup."
-msgstr "Você deve configurar o grupo de trabalho."
+#: komba2.cpp:102
+msgid "Enables/disables the statusbar"
+msgstr "Habilita/desabilita a barra de status"
 
-#: preferences.cpp:228
-msgid "No Workgroup"
-msgstr "Nenhum grupo de trabalho."
+#: komba2.cpp:113 komba2.cpp:136 komba2.cpp:233 komba2.cpp:270 komba2.cpp:287
+#: komba2.cpp:396
+msgid "Ready."
+msgstr "Pronto."
 
-#: preferences.cpp:233
-msgid "You must set the host."
-msgstr "Você deve configurar o host."
+#: komba2.cpp:134
+msgid "Opening file..."
+msgstr "Abrindo arquivo..."
 
-#: preferences.cpp:234
-msgid "No host"
-msgstr "Nenhum host."
+#: komba2.cpp:228
+msgid "Opening a new application window..."
+msgstr "Abrindo nova janela do aplicativo..."
+
+#: komba2.cpp:238
+msgid "Exiting..."
+msgstr "Saindo..."
+
+#: komba2.cpp:258
+msgid "Toggling toolbar..."
+msgstr "Mudando barra de ferramentas..."
+
+#: komba2.cpp:275
+msgid "Toggle the statusbar..."
+msgstr "Mudando barra de status..."
+
+#: komba2.cpp:392
+msgid "Mount Share..."
+msgstr "Montar compartilhamento..."
 
 #: myktreelistitem.cpp:375 myktreelistitem.cpp:410
 msgid "Internet Information Server"
@@ -255,103 +233,317 @@ msgstr "Eleições de Serviço de Navega
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: komba2.cpp:71
-msgid "New &Window"
-msgstr "Nova &Janela"
+#: komba2.moc.cpp:42 komba2.moc.cpp:47
+#, fuzzy
+msgid "Komba2App"
+msgstr "Komba2"
 
-#: komba2.cpp:73
-msgid "Recent mounts"
-msgstr "Montagens recentes"
+#: PrefDlg.cpp:162 preferences.moc.cpp:42 preferences.moc.cpp:47
+msgid "Preferences"
+msgstr ""
 
-#: komba2.cpp:76
-msgid "Configure"
-msgstr "Configurar"
+#: PrefDlg.cpp:179
+msgid "&Apply"
+msgstr ""
 
-#: komba2.cpp:77
-msgid "Mount"
-msgstr "Montar"
+#: PrefDlg.cpp:190
+msgid "IP - Range"
+msgstr ""
 
-#: komba2.cpp:78
-msgid "Mount on ..."
-msgstr "Montar em..."
+#: PrefDlg.cpp:192
+msgid "Here you can insert a range of ip's you want to scan."
+msgstr ""
 
-#: komba2.cpp:79
-msgid "Unmount"
+#: PrefDlg.cpp:196
+msgid "A&ppend"
+msgstr ""
+
+#: PrefDlg.cpp:200 PrefDlg.cpp:281
+msgid "D&elete"
+msgstr ""
+
+#: PrefDlg.cpp:206 PrefDlg.cpp:226 PrefDlg.cpp:232 PrefDlg.cpp:254
+msgid "insert here the first ip you want to scan"
+msgstr ""
+
+#: PrefDlg.cpp:216
+msgid "To"
+msgstr ""
+
+#: PrefDlg.cpp:220
+msgid "From"
+msgstr ""
+
+#: PrefDlg.cpp:248
+msgid "insert here the last ip you want to scan"
+msgstr ""
+
+#: PrefDlg.cpp:263
+msgid ""
+"You will only need to insert a range if you don't find any computers. Try it "
+"empty first.\n"
+"\n"
+"If you insert an iprange insert only host-ip's and leave the network address "
+"(example x.x.x.0) and broadcast (example x.x.x.255) out."
+msgstr ""
+
+#: PrefDlg.cpp:266
+msgid "IP-Range"
+msgstr ""
+
+#: PrefDlg.cpp:272
+msgid ""
+"If you want look at a specific host you can insert it here. It's normally "
+"not needed but sometimes it is easier to search for hosts/workgroups with "
+"it. \n"
+"For instance if you have a domain-controller you can insert it here. It "
+"knows all the other computers and names them when we scan it."
+msgstr ""
+
+#: InfoTabDlg.cpp:268 InfoTabDlg.cpp:454 PrefDlg.cpp:277 PrefDlg.cpp:303
+#, fuzzy
+msgid "Hosts"
+msgstr "Host"
+
+#: PrefDlg.cpp:291 komba2view.cpp:318 password.cpp:63
+msgid "Workgroup"
+msgstr "Grupo de trabalho"
+
+#: PrefDlg.cpp:295
+msgid "Append"
+msgstr ""
+
+#: InfoTabDlg.cpp:112 PrefDlg.cpp:299 komba2view.cpp:348 password.cpp:65
+msgid "Host"
+msgstr "Host"
+
+#: PrefDlg.cpp:309
+#, fuzzy
+msgid "mount"
 msgstr "Desmontar"
 
-#: komba2.cpp:80 komba2.cpp:81 komba2.cpp:82 komba2.cpp:83
-msgid "Set password"
-msgstr "Configura senha"
+#: PrefDlg.cpp:321
+msgid "Open Konqueror after mount"
+msgstr ""
 
-#: komba2.cpp:91
-msgid "Explore"
-msgstr "Explorar"
+#: PrefDlg.cpp:325
+#, fuzzy
+msgid "mount path"
+msgstr "Local de montagem : "
 
-#: komba2.cpp:93
-msgid "Ping"
-msgstr "Ping"
+#: PrefDlg.cpp:329
+msgid "Unmount all connections on exit"
+msgstr ""
 
-#: komba2.cpp:94
-msgid "Traceroute"
-msgstr "Traceroute"
+#: PrefDlg.cpp:331
+msgid "It will unmount ALL smb-shares on exit"
+msgstr ""
 
-#: komba2.cpp:96
-msgid "Deletes all items in it and rescan"
-msgstr "Apagar todos os ítens e reler"
+#: PrefDlg.cpp:335
+msgid "remount all on next start"
+msgstr ""
 
-#: komba2.cpp:98
-msgid "Mount a recently mounted share"
-msgstr "Monta um compartilhamento montado recentemente"
+#: PrefDlg.cpp:337
+msgid ""
+"the shares you connected at end of the last session will be remounted on "
+"next start of komba"
+msgstr ""
 
-#: komba2.cpp:99
-msgid "Opens a new application window"
-msgstr "Abre uma nova janela do aplicativo"
+#: PrefDlg.cpp:341
+msgid "display"
+msgstr ""
 
-#: komba2.cpp:100
-msgid "Quits the application"
-msgstr "Sai do programa"
+#: PrefDlg.cpp:345
+msgid "show $ shares"
+msgstr ""
 
-#: komba2.cpp:101
-msgid "Enables/disables the toolbar"
-msgstr "Habilita/disabilita a barra de ferramentas"
+#: PrefDlg.cpp:346
+msgid "so hidden shares like c$ will be shown"
+msgstr ""
 
-#: komba2.cpp:102
-msgid "Enables/disables the statusbar"
-msgstr "Habilita/desabilita a barra de status"
+#: PrefDlg.cpp:350
+msgid "show IPC shares"
+msgstr ""
 
-#: komba2.cpp:113 komba2.cpp:136 komba2.cpp:233 komba2.cpp:270 komba2.cpp:287
-#: komba2.cpp:396
-msgid "Ready."
-msgstr "Pronto."
+#: PrefDlg.cpp:351
+msgid "mostly can be hided"
+msgstr ""
 
-#: komba2.cpp:134
-msgid "Opening file..."
-msgstr "Abrindo arquivo..."
+#: PrefDlg.cpp:355
+#, fuzzy
+msgid "show printer"
+msgstr "Impressora"
 
-#: komba2.cpp:228
-msgid "Opening a new application window..."
-msgstr "Abrindo nova janela do aplicativo..."
+#: PrefDlg.cpp:356
+msgid "No printer support is implemented but you can see the printers"
+msgstr ""
 
-#: komba2.cpp:238
-msgid "Exiting..."
-msgstr "Saindo..."
+#: PrefDlg.cpp:360
+msgid "samba"
+msgstr ""
 
-#: komba2.cpp:258
-msgid "Toggling toolbar..."
-msgstr "Mudando barra de ferramentas..."
+#: PrefDlg.cpp:367
+msgid "version"
+msgstr ""
 
-#: komba2.cpp:275
-msgid "Toggle the statusbar..."
-msgstr "Mudando barra de status..."
+#: PrefDlg.cpp:371 scan.moc.cpp:42 scan.moc.cpp:47
+msgid "scan"
+msgstr ""
 
-#: komba2.cpp:392
-msgid "Mount Share..."
-msgstr "Montar compartilhamento..."
+#: PrefDlg.cpp:375
+msgid "scan every workgroup which will be found"
+msgstr ""
+
+#: PrefDlg.cpp:379
+msgid "scan every host which will be found"
+msgstr ""
+
+#: PrefDlg.cpp:380
+msgid "If you have many computers in your network scan will need a long time"
+msgstr ""
+
+#: PrefDlg.cpp:384
+#, fuzzy
+msgid "no password dialog"
+msgstr "Configura senha"
+
+#: PrefDlg.cpp:385
+msgid "it does'nt asks for passwords (scanning only)"
+msgstr ""
+
+#: PrefDlg.cpp:389
+#, fuzzy
+msgid "Passwords"
+msgstr "Senha de host"
+
+#: PrefDlg.cpp:393
+msgid "save by default"
+msgstr ""
+
+#: PrefDlg.cpp:394
+msgid "It makes the option \"save\" in accountdialog checked by default"
+msgstr ""
+
+#: PrefDlg.cpp:395
+#, fuzzy
+msgid "Scan/Mount"
+msgstr "Montar"
 
 #: scan.cpp:36
 msgid "Scanning hosts"
 msgstr "Lendo hosts"
 
+#: mymaster.moc.cpp:42 mymaster.moc.cpp:47
+#, fuzzy
+msgid "MyMaster"
+msgstr "Master : "
+
+#: socketserver.moc.cpp:42 socketserver.moc.cpp:47
+msgid "Socketserver"
+msgstr ""
+
+#: InfoTabDlg.cpp:532 komba2view.cpp:364 password.cpp:67
+msgid "Share"
+msgstr "Compartilhamento"
+
+#: smbclient.moc.cpp:42 smbclient.moc.cpp:47
+msgid "smbclient"
+msgstr ""
+
+#: debugoutput.moc.cpp:42 debugoutput.moc.cpp:47
+msgid "DebugOutput"
+msgstr ""
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: main.cpp:9 main.cpp:23
+msgid "Komba2"
+msgstr "Komba2"
+
+#: main.cpp:15
+msgid "file to open"
+msgstr "arquivo a abrir"
+
+#: iplook.moc.cpp:42 iplook.moc.cpp:47
+msgid "IPLook"
+msgstr ""
+
+#: komba2view.moc.cpp:42 komba2view.moc.cpp:47
+#, fuzzy
+msgid "Komba2View"
+msgstr "Komba2"
+
+#: sendmessage.moc.cpp:42 sendmessage.moc.cpp:47
+#, fuzzy
+msgid "SendMessage"
+msgstr "Enviar mensagem"
+
+#: InfoTabDlg.cpp:88 MessageDlg.cpp:35 PasswordDlg.cpp:36
+msgid "Form1"
+msgstr ""
+
+#: PasswordDlg.cpp:60
+#, fuzzy
+msgid "Password"
+msgstr "Senha de host"
+
+#: PasswordDlg.cpp:71
+msgid "Username :"
+msgstr ""
+
+#: PasswordDlg.cpp:76
+#, fuzzy
+msgid "Password :"
+msgstr "Senha de host"
+
+#: PasswordDlg.cpp:92
+msgid "store in"
+msgstr ""
+
+#: PasswordDlg.cpp:101
+msgid "which password will be set ?"
+msgstr ""
+
+#: PasswordDlg.cpp:107
+msgid "save"
+msgstr ""
+
+#: PasswordDlg.cpp:109
+msgid "If it is checked the password will be stored in configfile."
+msgstr ""
+
+#: MessageDlg.moc.cpp:43 MessageDlg.moc.cpp:48
+msgid "MessageDlg"
+msgstr ""
+
+#: recentmounts.moc.cpp:42 recentmounts.moc.cpp:47
+#, fuzzy
+msgid "RecentMounts"
+msgstr "Montagens recentes"
+
+#: message.moc.cpp:42 message.moc.cpp:47
+#, fuzzy
+msgid "Message"
+msgstr "Enviar mensagem"
+
+#: PrefDlg.moc.cpp:43 PrefDlg.moc.cpp:48
+msgid "PrefDlg"
+msgstr ""
+
+#: komba2doc.cpp:93 komba2view.cpp:47 komba2view.cpp:57 komba2view.cpp:281
+msgid "Network"
+msgstr "Rede"
+
 #: komba2doc.cpp:326
 msgid "Domain-Password"
 msgstr "Senha de domínio"
@@ -408,6 +600,10 @@ msgstr "Problema ao criar o local de mon
 msgid "Scaning network"
 msgstr "Lendo a rede"
 
+#: komba2doc.cpp:755 komba2view.cpp:259
+msgid "Choose a mountpath"
+msgstr "Escolha um local de montagem"
+
 #: komba2doc.cpp:890
 msgid "No message services found on this host."
 msgstr "Nenhum serviço de mensagens encontrado nesse host."
@@ -420,3 +616,222 @@ msgstr "Nenhum serviço"
 msgid "Ready"
 msgstr "Pronto"
 
+#: PasswordDlg.moc.cpp:43 PasswordDlg.moc.cpp:48
+#, fuzzy
+msgid "PasswordDlg"
+msgstr "Senha de host"
+
+#: komba2doc.moc.cpp:42 komba2doc.moc.cpp:47
+#, fuzzy
+msgid "Komba2Doc"
+msgstr "Komba2"
+
+#: InfoTabDlg.moc.cpp:43 InfoTabDlg.moc.cpp:48
+msgid "InfoTab"
+msgstr ""
+
+#: preferences.cpp:134
+msgid "Choose a prefered mountpath"
+msgstr "Escolhe um local de montagem preferido"
+
+#: preferences.cpp:142
+msgid "You must select a path ! Please try again. "
+msgstr "Você deve escolher um local! Tente novamente. "
+
+#: preferences.cpp:143
+msgid "Mountpath not correct"
+msgstr "Caminho incorreto"
+
+#: preferences.cpp:179
+msgid "The from-IP is bigger than the to-IP."
+msgstr "O IP \"de\" é maior que o IP \"até\"."
+
+#: preferences.cpp:180 preferences.cpp:188 preferences.cpp:195
+msgid "Not correct IP"
+msgstr "IP incorreto"
+
+#: preferences.cpp:187 preferences.cpp:194
+msgid "This is'nt an IP-Address. Please try again. "
+msgstr "Isto não é um endereço IP. Tente novamente. "
+
+#: preferences.cpp:226
+msgid "You must set the workgroup."
+msgstr "Você deve configurar o grupo de trabalho."
+
+#: preferences.cpp:227
+msgid "No Workgroup"
+msgstr "Nenhum grupo de trabalho."
+
+#: preferences.cpp:232
+msgid "You must set the host."
+msgstr "Você deve configurar o host."
+
+#: preferences.cpp:233
+msgid "No host"
+msgstr "Nenhum host."
+
+#: InfoTabDlg.cpp:575 komba2view.cpp:58
+msgid "IP"
+msgstr "IP"
+
+#: komba2view.cpp:59
+msgid "Comment"
+msgstr "Comentário"
+
+#: komba2view.cpp:170
+msgid "Samba-Network"
+msgstr "Rede Samba"
+
+#: komba2view.cpp:173
+msgid "Master : "
+msgstr "Master : "
+
+#: komba2view.cpp:179 komba2view.cpp:189
+msgid "Comment : "
+msgstr "Comentário : "
+
+#: komba2view.cpp:185
+msgid "Mountpath : "
+msgstr "Local de montagem : "
+
+#: komba2view.cpp:354 komba2view.cpp:379
+msgid "unknown"
+msgstr "desconhecido"
+
+#: komba2view.cpp:370
+msgid "Disk"
+msgstr "Disco"
+
+#: komba2view.cpp:373
+msgid "Printer"
+msgstr "Impressora"
+
+#: komba2view.cpp:376
+msgid "IPC$"
+msgstr "IPC$"
+
+#: MessageDlg.cpp:43
+msgid "&Send"
+msgstr ""
+
+#: MessageDlg.cpp:74
+msgid "Netname :"
+msgstr ""
+
+#: InfoTabDlg.cpp:141
+msgid "Netbiosname"
+msgstr ""
+
+#: InfoTabDlg.cpp:142
+#, fuzzy
+msgid "Service"
+msgstr "Nenhum serviço"
+
+#: InfoTabDlg.cpp:143
+msgid "Type"
+msgstr ""
+
+#: InfoTabDlg.cpp:144
+msgid "Group"
+msgstr ""
+
+#: InfoTabDlg.cpp:145
+#, fuzzy
+msgid "Known Service"
+msgstr "Nenhum serviço"
+
+#: InfoTabDlg.cpp:175
+msgid "Server :"
+msgstr ""
+
+#: InfoTabDlg.cpp:180 InfoTabDlg.cpp:325 InfoTabDlg.cpp:367
+msgid "Name :"
+msgstr ""
+
+#: InfoTabDlg.cpp:186
+msgid "IP adress :"
+msgstr ""
+
+#: InfoTabDlg.cpp:192 InfoTabDlg.cpp:375
+#, fuzzy
+msgid "Comment :"
+msgstr "Comentário : "
+
+#: InfoTabDlg.cpp:198
+msgid "OS :"
+msgstr ""
+
+#: InfoTabDlg.cpp:279 InfoTabDlg.cpp:477
+msgid "Unix  :"
+msgstr ""
+
+#: InfoTabDlg.cpp:290 InfoTabDlg.cpp:465
+msgid "Windows 5.0 :"
+msgstr ""
+
+#: InfoTabDlg.cpp:296 InfoTabDlg.cpp:471
+msgid "Windows NT  :"
+msgstr ""
+
+#: InfoTabDlg.cpp:302 InfoTabDlg.cpp:483
+msgid "Other  :"
+msgstr ""
+
+#: InfoTabDlg.cpp:331 InfoTabDlg.cpp:511
+#, fuzzy
+msgid "Hosts :"
+msgstr "Host"
+
+#: InfoTabDlg.cpp:342
+#, fuzzy
+msgid "Master :"
+msgstr "Master : "
+
+#: InfoTabDlg.cpp:391
+#, fuzzy
+msgid "Mountpath :"
+msgstr "Local de montagem : "
+
+#: InfoTabDlg.cpp:397
+#, fuzzy
+msgid "Sharetype :"
+msgstr "Compartilhamento"
+
+#: InfoTabDlg.cpp:448
+#, fuzzy
+msgid "Workgroups :"
+msgstr "Grupo de trabalho"
+
+#: InfoTabDlg.cpp:533
+#, fuzzy
+msgid "Mountpath"
+msgstr "Local de montagem : "
+
+#: InfoTabDlg.cpp:540
+#, fuzzy
+msgid "Mounted"
+msgstr "Montar"
+
+#: InfoTabDlg.cpp:548
+msgid "Search the List"
+msgstr ""
+
+#: InfoTabDlg.cpp:558
+msgid "&Find"
+msgstr ""
+
+#: InfoTabDlg.cpp:567
+msgid "by Name"
+msgstr ""
+
+#: InfoTabDlg.cpp:568
+msgid "by IP (Hosts only)"
+msgstr ""
+
+#: InfoTabDlg.cpp:574
+msgid "Name"
+msgstr ""
+
+#: InfoTabDlg.cpp:579
+msgid "Search"
+msgstr ""
diff -pruN 0.73.beta-4/po/tr.po 0.73.beta-4ubuntu4/po/tr.po
--- 0.73.beta-4/po/tr.po	2003-03-06 20:31:55.000000000 +0000
+++ 0.73.beta-4ubuntu4/po/tr.po	2010-03-09 18:56:04.000000000 +0000
@@ -288,10 +288,8 @@ msgstr ""
 "gerekecektir. Önce boþ bir aralýk ile baþlayýn.\n"
 "\n"
 "Eðer bir IP aralýðý girmek istiyorsanýz, sadece makine IP numaralarýný "
-"yazarak að adresini (örneðin a.a.a.0) ya da yayýn adresini (örneðin "
-"a.a.a.255) bu listenin dýþýnda býrakýn."
-
-
+"yazarak að adresini (örneðin a.a.a.0) ya da yayýn adresini (örneðin a.a."
+"a.255) bu listenin dýþýnda býrakýn."
 
 #: PrefDlg.cpp:266
 msgid "IP-Range"
@@ -308,9 +306,8 @@ msgstr ""
 "Eðer adý belirli bir makine adýný arýyorsanýz lütfen aþaðýdaki boþluða "
 "girin. Bu iþlem normalde gerekmemektedir.\n"
 "\n"
-"Örneðin bir alan denetleyiciye sahipseniz adýný buraya girebilirsiniz. "
-"Bu alan denetleyici aðdaki diðer tüm bilgisayarlar hakkýnda bilgi "
-"sahibidir."
+"Örneðin bir alan denetleyiciye sahipseniz adýný buraya girebilirsiniz. Bu "
+"alan denetleyici aðdaki diðer tüm bilgisayarlar hakkýnda bilgi sahibidir."
 
 #: InfoTabDlg.cpp:268 InfoTabDlg.cpp:454 PrefDlg.cpp:277 PrefDlg.cpp:303
 msgid "Hosts"
@@ -458,13 +455,13 @@ msgstr "smbclient"
 msgid "DebugOutput"
 msgstr ""
 
-#: _translatorinfo.cpp:1 _translatorinfo.cpp:1
+#: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Görkem Çetin"
 
-#: _translatorinfo.cpp:3 _translatorinfo.cpp:3
+#: _translatorinfo.cpp:3
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"