Here is my proposed nmu diff.
diff -u stardict-3.0.1/debian/changelog stardict-3.0.1/debian/changelog
--- stardict-3.0.1/debian/changelog
+++ stardict-3.0.1/debian/changelog
@@ -1,3 +1,13 @@
+stardict (3.0.1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fixed build error with gcc-4.3 (Closes: #474861:)
+ Thanks to Bradley Smith <[EMAIL PROTECTED]> for patch.
+ * Fixed lintian error "build-depends-on-obsolete-package":
+ - Changed "x-dev" dependency to "x11proto-core-dev"
+
+ -- Mert Dirik <[EMAIL PROTECTED]> Sun, 29 Jun 2008 22:17:26 +0300
+
stardict (3.0.1-3) unstable; urgency=low
* Incorporates patch from Anibal Avelar <[EMAIL PROTECTED]>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/tests/t_config_file.cpp
+++ stardict-3.0.1/tests/t_config_file.cpp
@@ -8,6 +8,7 @@
#include <cstring>
#include <iterator>
#include <iostream>
+#include <memory>
#include <gtk/gtk.h>
#include "config_file.hpp"
only in patch2:
unchanged:
--- stardict-3.0.1.orig/tests/t_xml.cpp
+++ stardict-3.0.1/tests/t_xml.cpp
@@ -5,6 +5,7 @@
#include <glib.h>
#include <cstdlib>
#include <string>
+#include <cstring>
static void xml_decode(const char *str, std::string& decoded)
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/readword.cpp
+++ stardict-3.0.1/src/readword.cpp
@@ -3,6 +3,7 @@
#endif
#include <cstring>
+#include <cstdlib>
#include <string>
#include <glib/gi18n.h>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/gconf_file.cpp
+++ stardict-3.0.1/src/gconf_file.cpp
@@ -22,6 +22,8 @@
# include "config.h"
#endif
+#include <memory>
+
#include <glib/gi18n.h>
#include "gconf_file.hpp"
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/inifile.cpp
+++ stardict-3.0.1/src/inifile.cpp
@@ -25,6 +25,7 @@
#include <vector>
#include <cerrno>
#include <cstring>
+#include <cstdlib>
#include <cstdio>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/x11_iskeyspressed.hpp
+++ stardict-3.0.1/src/x11_iskeyspressed.hpp
@@ -1,6 +1,8 @@
#ifndef _X11_ISKEYSPRESSED_HPP_
#define _X11_ISKEYSPRESSED_HPP_
+#include <memory>
+
#include <gdk/gdkx.h>
#include <X11/keysym.h>
#include <gtk/gtk.h>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/pangoview.cpp
+++ stardict-3.0.1/src/pangoview.cpp
@@ -22,6 +22,8 @@
# include "config.h"
#endif
+#include <cstring>
+
#include "gtktextviewpango.h"
#include "utils.h"
#include "skin.h"//for SkinCursor definition
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/utils.cpp
+++ stardict-3.0.1/src/utils.cpp
@@ -22,6 +22,8 @@
# include "config.h"
#endif
+#include <cstring>
+
#include <glib.h>
#include <glib/gi18n.h>
#include <cstdlib>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/prefsdlg.cpp
+++ stardict-3.0.1/src/prefsdlg.cpp
@@ -21,6 +21,8 @@
# include "config.h"
#endif
+#include <cstdlib>
+
#include <glib/gi18n.h>
#include <glib/gstdio.h>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/src/sigc++/signal.h
+++ stardict-3.0.1/src/sigc++/signal.h
@@ -18,7 +18,7 @@
//Compilers, such as older versions of SUN Forte C++, that do not allow this also often
//do not allow a typedef to have the same name as a class in the typedef's definition.
//For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
- #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
+// #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
#endif
namespace sigc {
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
@@ -1,4 +1,6 @@
#include "stardict_html_parsedata.h"
+#include <cstring>
+#include <cstdlib>
#include <glib/gi18n.h>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp
@@ -1,5 +1,6 @@
#include "stardict_wiki_parsedata.h"
#include "stardict_wiki2xml.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp
@@ -1,5 +1,6 @@
#include "stardict_wiki2xml.h"
#include "WIKI2XML.h"
+#include <cstring>
#include <glib.h>
std::string wiki2xml(std::string &str)
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
@@ -1,4 +1,5 @@
#include "stardict_xdxf_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp
@@ -1,4 +1,5 @@
#include "stardict_wordnet_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
@@ -1,4 +1,5 @@
#include "court_widget.h"
+#include <cstring>
#include <math.h>
#include <list>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
@@ -1,5 +1,6 @@
#include "stardict_wordnet.h"
#include "court_widget.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp
@@ -1,6 +1,6 @@
#include "stardict_dictdotcn.h"
#include <glib/gi18n.h>
-#include <string>
+#include <cstring>
#include <list>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
@@ -1,4 +1,5 @@
#include "stardict_espeak.h"
+#include <cstring>
#include <espeak/speak_lib.h>
#include <glib/gi18n.h>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp
@@ -1,7 +1,8 @@
#include "stardict_qqwry.h"
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <string>
+#include <cstring>
+#include <cstdlib>
#ifdef _WIN32
#include <windows.h>
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-man-plugin/stardict_man.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp
@@ -1,6 +1,6 @@
#include "stardict_man.h"
#include <glib/gi18n.h>
-#include <string>
+#include <cstring>
static const StarDictPluginSystemInfo *plugin_info = NULL;
static bool need_prefix;
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp
@@ -1,4 +1,5 @@
#include "stardict_powerword_parsedata.h"
+#include <cstring>
#include <glib/gi18n.h>
#ifdef _WIN32
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
@@ -1,7 +1,8 @@
#include "stardict_gucharmap.h"
#include <glib/gi18n.h>
#include <gucharmap/gucharmap.h>
-#include <string>
+#include <cstring>
+#include <cstdlib>
static char *build_dictdata(char type, const char *definition)
{
only in patch2:
unchanged:
--- stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
+++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
@@ -1,4 +1,5 @@
#include "stardict_spell.h"
+#include <cstring>
#include <glib.h>
#include <glib/gi18n.h>
#include <enchant.h>
