tags 461681 + patch
thanks
Hi,
Attached is the diff for my ftpgrab 0.1.2r-9.1 NMU.
diff -u ftpgrab-0.1.2r/debian/changelog ftpgrab-0.1.2r/debian/changelog
--- ftpgrab-0.1.2r/debian/changelog
+++ ftpgrab-0.1.2r/debian/changelog
@@ -1,3 +1,10 @@
+ftpgrab (0.1.2r-9.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.3 (Closes: #461681).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 09 Mar 2008 18:03:13 +0000
+
ftpgrab (0.1.2r-9) unstable; urgency=low
* Prevent the upstream Makefile to strip binaries, such that the
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgbdfname.cc
+++ ftpgrab-0.1.2r/fgbdfname.cc
@@ -31,9 +31,11 @@
#endif
#ifndef __SGI_STL_VECTOR_H
-#include <vector.h>
+#include <vector>
#endif
+using namespace std;
+
struct FGBrokenDownFileName::Internal_FGBrokenDownFileName {
vector<FGFileNameComponent*> mComponents;
};
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgfshelp.cc
+++ ftpgrab-0.1.2r/fgfshelp.cc
@@ -24,6 +24,7 @@
#include <sys/file.h>
#include <assert.h>
+#include <cstring>
FGDirListing
FGFileSystemHelper::GetDirListing(const FGString& dir)
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgfilegrab.cc
+++ ftpgrab-0.1.2r/fgfilegrab.cc
@@ -48,6 +48,7 @@
#endif
#include <assert.h>
+#include <cstdlib>
class FGException;
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgmrank.cc
+++ ftpgrab-0.1.2r/fgmrank.cc
@@ -3,9 +3,11 @@
#include "fgmrank.h"
#ifndef __SGI_STL_VECTOR_H
-#include <vector.h>
+#include <vector>
#endif
+using namespace std;
+
struct FGMatchRanking::Internal_FGMatchRanking {
bool mIsMatch;
vector<int> mValues;
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgfilelist.cc
+++ ftpgrab-0.1.2r/fgfilelist.cc
@@ -7,9 +7,11 @@
#endif
#ifndef __SGI_STL_VECTOR_H
-#include <vector.h>
+#include <vector>
#endif
+using namespace std;
+
#ifndef _FGSTRING_H
#define "fgstring.h"
#endif
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgdlist.h
+++ ftpgrab-0.1.2r/fgdlist.h
@@ -8,9 +8,11 @@
#endif
#ifndef __SGI_STL_VECTOR_H
-#include <vector.h>
+#include <vector>
#endif
+using namespace std;
+
#ifndef _FGSTRING_H
#define "fgstring.h"
#endif
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgpickbest.cc
+++ ftpgrab-0.1.2r/fgpickbest.cc
@@ -27,9 +27,11 @@
#endif
#ifndef __SGI_STL_MAP_H
-#include <map.h>
+#include <map>
#endif
+using namespace std;
+
#include <assert.h>
#undef DEBUG_PICKER
only in patch2:
unchanged:
--- ftpgrab-0.1.2r.orig/fgalist.h
+++ ftpgrab-0.1.2r/fgalist.h
@@ -7,9 +7,11 @@
// a given grab rule e.g. fetch file A, delete file B
#ifndef __SGI_STL_VECTOR_H
-#include <vector.h>
+#include <vector>
#endif
+using namespace std;
+
class FGActionInterface;
class FGActionList : public vector<FGActionInterface*> {
