Hi,
The following is the diff for my stardict-tools 3.0.1-1.1 NMU.
diff -u stardict-tools-3.0.1/config.sub stardict-tools-3.0.1/config.sub
--- stardict-tools-3.0.1/config.sub
+++ stardict-tools-3.0.1/config.sub
@@ -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 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-06-28'
+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
@@ -72,8 +72,8 @@
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."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # 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.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -668,6 +680,14 @@
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
;;
@@ -813,6 +833,14 @@
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
;;
@@ -1021,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
diff -u stardict-tools-3.0.1/debian/changelog
stardict-tools-3.0.1/debian/changelog
--- stardict-tools-3.0.1/debian/changelog
+++ stardict-tools-3.0.1/debian/changelog
@@ -1,3 +1,10 @@
+stardict-tools (3.0.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3. Thanks to Cyril Brulebois. Closes: #455119
+
+ -- Andreas Barth <[EMAIL PROTECTED]> Sun, 16 Mar 2008 23:59:55 +0000
+
stardict-tools (3.0.1-1) unstable; urgency=low
* New upstream release
diff -u stardict-tools-3.0.1/config.guess stardict-tools-3.0.1/config.guess
--- stardict-tools-3.0.1/config.guess
+++ stardict-tools-3.0.1/config.guess
@@ -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 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-07-22'
+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
@@ -56,8 +56,8 @@
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."
@@ -532,7 +532,7 @@
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
@@ -799,6 +799,9 @@
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
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 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
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
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
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/bgl_stardictbuilder.cpp
+++ stardict-tools-3.0.1/src/bgl_stardictbuilder.cpp
@@ -22,6 +22,7 @@
#include <iostream>
#include <glib.h>
+#include <cstring>
StarDictBuilder::StarDictBuilder( std::string filename )
{
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/wordnet.cpp
+++ stardict-tools-3.0.1/src/wordnet.cpp
@@ -1,7 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <glib.h>
-#include <string>
+#include <string>
+#include <cstring>
static int hexalpha_to_int(int c)
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/bgl_babylon.cpp
+++ stardict-tools-3.0.1/src/bgl_babylon.cpp
@@ -32,6 +32,8 @@
#define DUP dup
#endif
+#include <cstring>
+
Babylon::Babylon( std::string filename )
{
m_filename = filename;
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/dictbuilder.cpp
+++ stardict-tools-3.0.1/src/dictbuilder.cpp
@@ -14,6 +14,8 @@
#include "dictbuilder-tree.h"
+#include <cstring>
+
struct sectionEntry
{
char sign;
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/wubi.cpp
+++ stardict-tools-3.0.1/src/wubi.cpp
@@ -5,6 +5,7 @@
#include <unistd.h>
#include <glib.h>
#include <string>
+#include <cstring>
void convert(const char *filename)
{
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/tabfile2sql.cpp
+++ stardict-tools-3.0.1/src/tabfile2sql.cpp
@@ -8,6 +8,7 @@
#include <mysql.h>
#include <string>
+#include <cstring>
void print_info(const char *info)
{
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/bgl2txt.cpp
+++ stardict-tools-3.0.1/src/bgl2txt.cpp
@@ -1,4 +1,5 @@
#include "libbgl2txt.h"
+#include <cstring>
int main(int argc, char * argv[])
{
only in patch2:
unchanged:
--- stardict-tools-3.0.1.orig/src/libbgl2txt.cpp
+++ stardict-tools-3.0.1/src/libbgl2txt.cpp
@@ -2,6 +2,8 @@
#include "bgl_babylonreader.h"
#include "bgl_stardictbuilder.h"
+#include <cstring>
+
void convert_bglfile(std::string infile, std::string source_charset,
std::string target_charset)
{
std::string outfile;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
