r15607 - in /desktop/unstable/dasher/debian: changelog patches/02_gcc-4.3.patch

[mlang at users.alioth.debian.org]

Author: mlang
Date: Wed Apr  9 14:31:28 2008
New Revision: 15607

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15607
Log:
debian/patches/02_gcc-4.3.patch: Readd and update since most of it
was merged upstream (Closes: Bug#475058).

Added:
    desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch
Modified:
    desktop/unstable/dasher/debian/changelog

Modified: desktop/unstable/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/changelog?rev=15607&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/changelog (original)
+++ desktop/unstable/dasher/debian/changelog Wed Apr  9 14:31:28 2008
@@ -1,8 +1,10 @@
 dasher (4.7.3-1) unstable; urgency=low
 
   * New upstream release (4.7.2 tarball was the wrong branch).
-
- -- Mario Lang <mlang at debian.org>  Tue, 08 Apr 2008 19:28:17 +0200
+  * debian/patches/02_gcc-4.3.patch: Readd and update since most of it
+    was merged upstream (Closes: Bug#475058).
+
+ -- Mario Lang <mlang at debian.org>  Wed, 09 Apr 2008 16:29:47 +0200
 
 dasher (4.7.2-1) unstable; urgency=low
 

Added: desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch?rev=15607&op=file
==============================================================================
--- desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch (added)
+++ desktop/unstable/dasher/debian/patches/02_gcc-4.3.patch Wed Apr  9 14:31:28 2008
@@ -1,0 +1,52 @@
+diff --git a/Src/Gtk2/dasher_action_speech.cpp b/Src/Gtk2/dasher_action_speech.cpp
+index b260eab..aae4040 100644
+--- a/Src/Gtk2/dasher_action_speech.cpp
++++ b/Src/Gtk2/dasher_action_speech.cpp
+@@ -8,6 +8,8 @@
+ #include <glib/gi18n.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <libbonobo.h>
++
++#include <cstring>
+ //#include <libintl.h>
+ //#include <string.h>
+ 
+diff --git a/Src/Gtk2/dasher_editor.cpp b/Src/Gtk2/dasher_editor.cpp
+index 992b6fe..5634214 100644
+--- a/Src/Gtk2/dasher_editor.cpp
++++ b/Src/Gtk2/dasher_editor.cpp
+@@ -43,6 +43,8 @@
+ #include "dasher_main.h"
+ //#include "game_mode_helper.h"
+ 
++#include <cstring>
++
+ #define ACTION_STATE_SHOW 1
+ #define ACTION_STATE_CONTROL 2
+ #define ACTION_STATE_AUTO 4
+diff --git a/Src/Gtk2/game_mode_helper.cpp b/Src/Gtk2/game_mode_helper.cpp
+index d96e88b..f73bb0b 100644
+--- a/Src/Gtk2/game_mode_helper.cpp
++++ b/Src/Gtk2/game_mode_helper.cpp
+@@ -3,6 +3,8 @@
+ #include "dasher_editor_internal.h"
+ #include <string>
+ 
++#include <cstring>
++
+ struct _GameModeHelperPrivate {
+   DasherEditorInternal* pEditor;
+   GtkDasherControl *pControl;
+diff --git a/Src/Gtk2/module_settings_window.cpp b/Src/Gtk2/module_settings_window.cpp
+index 37bfc5c..100911a 100644
+--- a/Src/Gtk2/module_settings_window.cpp
++++ b/Src/Gtk2/module_settings_window.cpp
+@@ -22,6 +22,8 @@
+ 
+ #include <glib/gi18n.h>
+ 
++#include <cstring>
++
+ typedef struct _ModuleSettingsData ModuleSettingsData;
+ 
+ struct _ModuleSettingsData {