diff -pruN 0.4.2-2/config.guess 0.4.2-2.2/config.guess --- 0.4.2-2/config.guess 2008-04-29 02:43:15.000000000 +0100 +++ 0.4.2-2.2/config.guess 2008-04-29 02:43:15.000000000 +0100 @@ -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 +# Free Software Foundation, Inc. -timestamp='2006-02-23' +timestamp='2008-01-23' # 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." @@ -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 @@ -210,7 +212,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ 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} @@ -328,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -530,7 +532,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 @@ -770,6 +772,8 @@ EOF 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 @@ -777,10 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS_NT-*:*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,18 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + 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 ;; @@ -829,6 +836,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:*:*) @@ -947,6 +964,9 @@ EOF 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 @@ -989,7 +1009,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -1205,6 +1225,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 ;; @@ -1455,9 +1484,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.4.2-2/config.sub 0.4.2-2.2/config.sub --- 0.4.2-2/config.sub 2008-04-29 02:43:15.000000000 +0100 +++ 0.4.2-2.2/config.sub 2008-04-29 02:43:15.000000000 +0100 @@ -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 +# Free Software Foundation, Inc. -timestamp='2006-02-23' +timestamp='2008-01-16' # 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 Sat, 12 Apr 2008 01:10:51 +0100 + +sdcv (0.4.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 4.3 (Closes: #417687). + * Update Slovak translation (Closes: #441754). + + -- Luk Claes Fri, 14 Mar 2008 22:22:31 +0000 + sdcv (0.4.2-2) unstable; urgency=low * Apply patch for AMD64 build by Matej Vela diff -pruN 0.4.2-2/debian/control 0.4.2-2.2/debian/control --- 0.4.2-2/debian/control 2008-04-29 02:43:15.000000000 +0100 +++ 0.4.2-2.2/debian/control 2008-04-29 02:43:15.000000000 +0100 @@ -3,7 +3,8 @@ Priority: optional Section: utils Maintainer: Cai Qian Build-Depends: debhelper (>= 4.0.0), gettext, zlib1g-dev, pkg-config, libglib2.0-dev, libreadline5-dev | libreadline-dev -Standards-Version: 3.7.2.0 +Standards-Version: 3.7.3 +Homepage: http://sdcv.sourceforge.net/ Package: sdcv Section: utils @@ -12,8 +13,3 @@ Depends: ${shlibs:Depends} Description: StarDict Console Version sdcv is simple, cross-platform text-base utility for work with dictionaries in StarDict's format. - . - Homepage: http://sdcv.sourceforge.net/ - - - diff -pruN 0.4.2-2/debian/watch 0.4.2-2.2/debian/watch --- 0.4.2-2/debian/watch 2008-04-29 02:43:15.000000000 +0100 +++ 0.4.2-2.2/debian/watch 2008-04-29 02:43:15.000000000 +0100 @@ -1,2 +1,2 @@ version=3 -http://prdownloads.sourceforge.net/s/sd/sdcv/sdcv-(.*)\.tar\.bz2 +http://sf.net/sdcv/sdcv-(.*)\.tar\.bz2 diff -pruN 0.4.2-2/po/sk.po 0.4.2-2.2/po/sk.po --- 0.4.2-2/po/sk.po 2006-04-24 12:18:49.000000000 +0100 +++ 0.4.2-2.2/po/sk.po 2008-04-29 02:43:15.000000000 +0100 @@ -1,21 +1,21 @@ # translation of sdcv.po to Slovak # Copyright (C) # Zdenko Podobný , 2004, 2005. +# Ivan Masár , 2007. # msgid "" msgstr "" "Project-Id-Version: sdcv 0.3.2\n" "Report-Msgid-Bugs-To: dushistov@mail.ru\n" "POT-Creation-Date: 2006-04-24 15:18+0400\n" -"PO-Revision-Date: 2005-01-04 20:19+0100\n" -"Last-Translator: Zdenko Podobný \n" -"Language-Team: Slovak <>\n" +"PO-Revision-Date: 2007-09-11 00:22+0100\n" +"Last-Translator: Ivan Masár \n" +"Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/sdcv.cpp:127 #, c-format @@ -24,7 +24,7 @@ msgid "" "Try '%s --help' for more information.\n" msgstr "" "Neznáma voľba.\n" -"Skúste `%s --help'.\n" +"Skúste „%s --help“.\n" #: src/sdcv.cpp:134 #, c-format @@ -43,15 +43,12 @@ msgstr "-v, --version zobraz #: src/sdcv.cpp:137 #, c-format -msgid "" -"-l, --list-dicts display list of available dictionaries and exit\n" -msgstr "" -"-l, --list-dicts zobrazí zoznam dostupných slovníkov a skončí\n" +msgid "-l, --list-dicts display list of available dictionaries and exit\n" +msgstr "-l, --list-dicts zobrazí zoznam dostupných slovníkov a skončí\n" #: src/sdcv.cpp:138 #, c-format -msgid "" -"-u, --use-dict bookname for search use only dictionary with this bookname\n" +msgid "-u, --use-dict bookname for search use only dictionary with this bookname\n" msgstr "-u, --use-dict názov použiť pre hľadanie iba zvolený slovník\n" #: src/sdcv.cpp:139 @@ -71,12 +68,8 @@ msgstr "--utf8-input vstup p #: src/sdcv.cpp:142 #, c-format -msgid "" -"--data-dir path/to/dir use this directory as path to stardict data " -"directory\n" -msgstr "" -"--data-dir path/to/dir použiť tento priečinok ako cestu pre stardict " -"dátový priečinok\n" +msgid "--data-dir path/to/dir use this directory as path to stardict data directory\n" +msgstr "--data-dir path/to/dir použiť tento priečinok ako cestu pre stardict dátový priečinok\n" #: src/sdcv.cpp:148 #, c-format @@ -84,14 +77,14 @@ msgid "Console version of Stardict, vers msgstr "Konzolová verzia StarDict, verzia %s\n" #: src/sdcv.cpp:169 -#, fuzzy, c-format +#, c-format msgid "Dictionary's name Word count\n" -msgstr "názov počet slov\n" +msgstr "názov slovníka počet slov\n" #: src/sdcv.cpp:191 #, c-format msgid "g_mkdir failed: %s\n" -msgstr "" +msgstr "g_mkdir zlyhalo: %s\n" #: src/sdcv.cpp:207 msgid "Enter word or phrase: " @@ -104,31 +97,32 @@ msgstr "Nie je čo preložiť.\n" #: src/libwrapper.cpp:245 msgid "popen failed" -msgstr "" +msgstr "popen zlyhalo" #: src/libwrapper.cpp:282 #, c-format msgid "Can not convert %s to utf8.\n" msgstr "nie je možné konvertovať %s na utf8.\n" -#: src/libwrapper.cpp:339 src/libwrapper.cpp:371 +#: src/libwrapper.cpp:339 +#: src/libwrapper.cpp:371 #, c-format msgid "Found %d items, similar to %s.\n" msgstr "Nájdené %d položiek, podobných %s,\n" #: src/libwrapper.cpp:352 -#, fuzzy, c-format +#, c-format msgid "Your choice[-1 to abort]: " -msgstr "Vaša voľba: " +msgstr "Vaša voľba[-1 zruší]: " #: src/libwrapper.cpp:366 -#, fuzzy, c-format +#, c-format msgid "" "Invalid choise.\n" "It must be from 0 to %d or -1.\n" msgstr "" "Neplatná voľba.\n" -"Musí byť od 0 po %d.\n" +"Musí byť od 0 do %d alebo -1.\n" #: src/libwrapper.cpp:382 #, c-format @@ -137,6 +131,6 @@ msgstr "Ľutujem, nič sa nepodobá na % #~ msgid "Can not convert %s to current locale.\n" #~ msgstr "Nie je možné konvertovať %s na aktuálne locale.\n" - #~ msgid "There is no dictionary with this bookname: %s.\n" #~ msgstr "Neexistuje slovník s takýmto názvom: %s.\n" + diff -pruN 0.4.2-2/src/libwrapper.cpp 0.4.2-2.2/src/libwrapper.cpp --- 0.4.2-2/src/libwrapper.cpp 2008-04-29 02:43:15.000000000 +0100 +++ 0.4.2-2.2/src/libwrapper.cpp 2008-04-29 02:43:15.000000000 +0100 @@ -24,6 +24,7 @@ #include #include +#include #include "utils.hpp" diff -pruN 0.4.2-2/src/readline.cpp 0.4.2-2.2/src/readline.cpp --- 0.4.2-2/src/readline.cpp 2005-12-07 22:07:23.000000000 +0000 +++ 0.4.2-2.2/src/readline.cpp 2008-04-29 02:43:15.000000000 +0100 @@ -23,6 +23,7 @@ #endif #include +#include #ifdef WITH_READLINE # include # include diff -pruN 0.4.2-2/src/utils.cpp 0.4.2-2.2/src/utils.cpp --- 0.4.2-2/src/utils.cpp 2006-04-24 10:03:47.000000000 +0100 +++ 0.4.2-2.2/src/utils.cpp 2008-04-29 02:43:15.000000000 +0100 @@ -22,6 +22,7 @@ # include "config.h" #endif +#include #include #include