Package: wordtrans
Version: 1.1pre15-3
Severity: normal
Tags: patch
Hi,
Attached is the diff for my wordtrans 1.1pre15-3.1 NMU.
Cheers,
Moritz
diff -u wordtrans-1.1pre15/src/qconfig/appconf.cpp wordtrans-1.1pre15/src/qconfig/appconf.cpp
--- wordtrans-1.1pre15/src/qconfig/appconf.cpp
+++ wordtrans-1.1pre15/src/qconfig/appconf.cpp
@@ -71,8 +71,8 @@
#include <fcntl.h>
#include <sys/types.h>
-#include <fstream.h>
-#include <string.h>
+#include <fstream>
+#include <cstring>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff -u wordtrans-1.1pre15/src/qconfig/appconf.h wordtrans-1.1pre15/src/qconfig/appconf.h
--- wordtrans-1.1pre15/src/qconfig/appconf.h
+++ wordtrans-1.1pre15/src/qconfig/appconf.h
@@ -106,9 +106,11 @@
# include <config.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
+using namespace std;
+
// make sure we have a Bool type
// Change by Ricardo Villalba. Bool = bool (not int).
#define Bool bool
diff -u wordtrans-1.1pre15/debian/TODO.Debian wordtrans-1.1pre15/debian/TODO.Debian
--- wordtrans-1.1pre15/debian/TODO.Debian
+++ wordtrans-1.1pre15/debian/TODO.Debian
@@ -2,7 +2,7 @@
- Fix the sources in src/qconfig/ in order to use proper
g++ 3.3 headers (to avoid warnings and potential issues)
Note: it seems to not be able to find the declarations if
-<iostream> is used instead of <iostream.h> it has to be investigated
+<iostream> is used instead of <iostream> it has to be investigated
further.
- Consider providing the dictionaries (text files and babylon files)
diff -u wordtrans-1.1pre15/debian/changelog wordtrans-1.1pre15/debian/changelog
--- wordtrans-1.1pre15/debian/changelog
+++ wordtrans-1.1pre15/debian/changelog
@@ -1,3 +1,11 @@
+wordtrans (1.1pre15-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix GCC 4.3 compatibility, patch by Kumar Appaiah (Closes: #461722)
+ * Stop using libqt3-compat-headers, patch by Barry deFreese (Closes: #464904)
+
+ -- Moritz Muehlenhoff <[EMAIL PROTECTED]> Mon, 24 Mar 2008 17:31:30 +0100
+
wordtrans (1.1pre15-3) unstable; urgency=low
* Swap the Build-Depends on kdelibs to prevent the autobuilders from getting
diff -u wordtrans-1.1pre15/debian/control-kde wordtrans-1.1pre15/debian/control-kde
--- wordtrans-1.1pre15/debian/control-kde
+++ wordtrans-1.1pre15/debian/control-kde
@@ -4,7 +4,7 @@
Maintainer: Javier Fernandez-Sanguino Pen~a <[EMAIL PROTECTED]>
Standards-Version: 3.7.2.2
Build-Depends-Indep: gettext, groff
-Build-Depends: debhelper, linuxdoc-tools-text, libfribidi-dev, kdelibs4-dev | kdelibs-dev (>= 2.2.2-13), recode, libqt3-compat-headers, php5-dev, g++ (>= 4:4.0.2-2) [arm hppa m68k] | g++-3.4 [arm hppa m68k], dpkg-dev (>= 1.13.2)
+Build-Depends: debhelper, linuxdoc-tools-text, libfribidi-dev, kdelibs4-dev | kdelibs-dev (>= 2.2.2-13), recode, php5-dev, g++ (>= 4:4.0.2-2) [arm hppa m68k] | g++-3.4 [arm hppa m68k], dpkg-dev (>= 1.13.2)
Package: wordtrans-data
Architecture: all
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/QApplicationWindow.cpp
+++ wordtrans-1.1pre15/src/QApplicationWindow.cpp
@@ -46,7 +46,7 @@
#include <qmessagebox.h>
#include <qapplication.h>
#include <qaccel.h>
-#include <qmsgbox.h>
+#include <qmessagebox.h>
#include <qdatetime.h>
#include <string.h>
#include <qfontdialog.h>
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/qconfig/SimpleConfig.cpp
+++ wordtrans-1.1pre15/src/qconfig/SimpleConfig.cpp
@@ -3,7 +3,7 @@
#include <SimpleConfig.h>
#include <stdlib.h>
-#include <fstream.h>
+#include <fstream>
#include <cstring> //Soluciona el bug #113819 de Debian
#include "../salidas.h" //¡Añade dependencia a un fichero externo!
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/libbab/libbab.cc
+++ wordtrans-1.1pre15/src/libbab/libbab.cc
@@ -30,6 +30,9 @@
#include <list>
#include <cctype>
#include <cerrno>
+#include <cstring>
+
+using namespace std;
#ifdef HONOR_STD
using std::istream ;
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/no-gui.cpp
+++ wordtrans-1.1pre15/src/no-gui.cpp
@@ -27,6 +27,7 @@
#include "salidas.h"
#include <qtextcodec.h>
#include "version.h"
+#include <cstring>
#define BUSCAR 1
#define SHOW_DESC 2
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/libidp.cpp
+++ wordtrans-1.1pre15/src/libidp.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include "libidp.h"
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
string conv_idp="a/áe/éi/ío/óu/úa\\àe\\èi\\ìo\\òu\\ùn~ña.äe.ëi.ïo.öu.ü"
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/idp2text.cpp
+++ wordtrans-1.1pre15/src/idp2text.cpp
@@ -19,7 +19,7 @@
#include <config.h>
#endif
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
#include <string>
#include <stdio.h>
only in patch2:
unchanged:
--- wordtrans-1.1pre15.orig/src/kdeui/kjanuswidget.h
+++ wordtrans-1.1pre15/src/kdeui/kjanuswidget.h
@@ -24,7 +24,7 @@
#include <qgrid.h>
-#include <qlist.h>
+#include <qptrlist.h>
#include <qpixmap.h>
#include <qsplitter.h>
