tags 417713 + patch
thanks
Hi,
Attached is the diff for my subcommander 1.2.2-1.1 NMU.
diff -u subcommander-1.2.2/debian/patches/00list subcommander-1.2.2/debian/patches/00list
--- subcommander-1.2.2/debian/patches/00list
+++ subcommander-1.2.2/debian/patches/00list
@@ -3,0 +4 @@
+50-ftbfs-gcc-4.3
diff -u subcommander-1.2.2/debian/control subcommander-1.2.2/debian/control
--- subcommander-1.2.2/debian/control
+++ subcommander-1.2.2/debian/control
@@ -4,7 +4,7 @@
Maintainer: Andreas Fester <[EMAIL PROTECTED]>
Uploaders: Loic Minier <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 5.0.0), dpatch, libqt3-mt-dev (>> 3.3),
- libboost-dev, libapr1-dev, libdb4.4-dev, libsvn-dev, libneon26-dev,
+ libboost-dev, libapr1-dev, libdb4.6-dev, libsvn-dev, libneon27-dev,
libssl-dev, xsltproc, docbook-xsl, autotools-dev, dpkg-dev (>= 1.13.19)
Standards-Version: 3.7.2
diff -u subcommander-1.2.2/debian/changelog subcommander-1.2.2/debian/changelog
--- subcommander-1.2.2/debian/changelog
+++ subcommander-1.2.2/debian/changelog
@@ -1,3 +1,13 @@
+subcommander (1.2.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Added debian/patches/50-ftbfs-gcc-4.3.dpatch to fix FTBFS with gcc 4.3
+ (Closes: #417713)
+ Thanks for the patch to Martin Michlmayr
+ * Adjusted build depends to get this thing compiling
+
+ -- Alexander Schmehl <[EMAIL PROTECTED]> Sun, 06 Apr 2008 01:01:45 +0200
+
subcommander (1.2.2-1) unstable; urgency=medium
* New upstream *stable* release. No new functionality, fixes
only in patch2:
unchanged:
--- subcommander-1.2.2.orig/debian/patches/50-ftbfs-gcc-4.3.dpatch
+++ subcommander-1.2.2/debian/patches/50-ftbfs-gcc-4.3.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-ftbfs-gcc-4.3.dpatch by Alexander Schmehl <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes #417713 a FTBFS with gcc 4.3
+
[EMAIL PROTECTED]@
+diff -urNad subcommander-1.2.2~/sublib/MsgHandler.cpp subcommander-1.2.2/sublib/MsgHandler.cpp
+--- subcommander-1.2.2~/sublib/MsgHandler.cpp 2008-04-06 01:43:12.000000000 +0200
++++ subcommander-1.2.2/sublib/MsgHandler.cpp 2008-04-06 01:43:15.000000000 +0200
+@@ -7,6 +7,8 @@
+ * ====================================================================
+ */
+
++#include <cstdlib>
++
+ // sc
+ #include "config.h"
+ #include "MsgHandler.h"
+diff -urNad subcommander-1.2.2~/sublib/Utility.cpp subcommander-1.2.2/sublib/Utility.cpp
+--- subcommander-1.2.2~/sublib/Utility.cpp 2008-04-06 01:43:12.000000000 +0200
++++ subcommander-1.2.2/sublib/Utility.cpp 2008-04-06 01:43:15.000000000 +0200
+@@ -25,6 +25,7 @@
+ #endif // _WIN32
+
+ // sys
++#include <cstdlib>
+ #include <locale.h>
+
+
+diff -urNad subcommander-1.2.2~/submerge/LineTokenizer.cpp subcommander-1.2.2/submerge/LineTokenizer.cpp
+--- subcommander-1.2.2~/submerge/LineTokenizer.cpp 2008-04-06 01:43:12.000000000 +0200
++++ subcommander-1.2.2/submerge/LineTokenizer.cpp 2008-04-06 01:43:44.000000000 +0200
+@@ -14,6 +14,8 @@
+ //#include <sstream>
+ #include <strstream>
+
++#include <cstring>
++
+ LineTokenizer::LineTokenizer( const unsigned char* buf, size_t size )
+ : _buf(buf), _size(size)
+ {
