Hi, debdiff attached. Let me know, if I can be of further help.
Best regards Ben On Tue, 2013-04-16 at 20:31 +0200, Felix Geyer wrote: > Hi, > > On 16.04.2013 20:06, Benjamin Mesing wrote: > > Hi, > > > > if you have no objections, I would raise the severity. > > > > If desired I could also NMU the package. > > Please go ahead. > There's no need for a NMU but a debdiff for me to upload > would be appreciated. > > Regards, > Felix
diff -Nru warmux-11.04.1+repack/debian/changelog warmux-11.04.1+repack/debian/changelog
--- warmux-11.04.1+repack/debian/changelog 2012-05-13 11:22:10.000000000 +0200
+++ warmux-11.04.1+repack/debian/changelog 2013-04-16 21:33:45.000000000 +0200
@@ -1,3 +1,12 @@
+warmux (1:11.04.1+repack-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix #701214: does no longer rely on dirent.d_type (did not work
+ on some file systems), backport from current upstream SVN
+ - Add 08_fix_dirlisting.patch
+
+ -- Benjamin Mesing <bensm...@gmx.net> Tue, 16 Apr 2013 21:15:25 +0200
+
warmux (1:11.04.1+repack-3) unstable; urgency=low
* Fix FTBFS with gcc 4.7. (Closes: #672051)
diff -Nru warmux-11.04.1+repack/debian/patches/08_fix_dirlisting.patch warmux-11.04.1+repack/debian/patches/08_fix_dirlisting.patch
--- warmux-11.04.1+repack/debian/patches/08_fix_dirlisting.patch 1970-01-01 01:00:00.000000000 +0100
+++ warmux-11.04.1+repack/debian/patches/08_fix_dirlisting.patch 2013-04-16 21:35:18.000000000 +0200
@@ -0,0 +1,67 @@
+--- a/lib/warmux/tools/file_tools.cpp
++++ b/lib/warmux/tools/file_tools.cpp
+@@ -33,6 +33,8 @@
+ # include <direct.h>
+ # undef DeleteFile // windows.h defines it I think
+ #else
++# include <sys/types.h>
++# include <sys/stat.h>
+ # include <stdlib.h> // getenv
+ # include <unistd.h> // not needed by mingw
+ #endif
+@@ -275,18 +277,14 @@
+ {
+ DIR *dir;
+ struct dirent *file;
+-#ifdef __SYMBIAN32__
+ std::string dname;
+-#endif
+ };
+
+ FolderSearch* OpenFolder(const std::string& dirname)
+ {
+ FolderSearch *f = new FolderSearch;
+ f->dir = opendir(dirname.c_str());
+-#ifdef __SYMBIAN32__
+ f->dname = dirname;
+-#endif
+
+ if (!f->dir) {
+ delete f;
+@@ -300,11 +298,11 @@
+ {
+ while ((f->file = readdir(f->dir)) != NULL) {
+
++ if (
+ #ifdef __SYMBIAN32__
+- if (f->file->d_namlen && DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) {
+-#else
+- if (f->file->d_type == DT_DIR) {
++ f->file->d_namlen &&
+ #endif
++ DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) {
+ // If we are also looking for files, report it isn't one
+ if (file)
+ file = false;
+@@ -316,11 +314,11 @@
+ continue;
+
+ // This is a file and we do search for file
++ if (
+ #ifdef __SYMBIAN32__
+- if (f->file->d_namlen && DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) {
+-#else
+- if (f->file->d_type == DT_REG) {
++ f->file->d_namlen &&
+ #endif
++ DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) {
+ file = true;
+ return f->file->d_name;
+ }
+@@ -390,4 +388,4 @@
+ }
+
+ return formated_name;
+-}
++}
+\ No newline at end of file
diff -Nru warmux-11.04.1+repack/debian/patches/series warmux-11.04.1+repack/debian/patches/series
--- warmux-11.04.1+repack/debian/patches/series 2012-05-13 11:13:02.000000000 +0200
+++ warmux-11.04.1+repack/debian/patches/series 2013-04-16 21:36:19.000000000 +0200
@@ -5,3 +5,4 @@
05_fix_build_libpng15.patch
06_fix_build_sdlnet.patch
07_fix_build_gcc47.patch
+08_fix_dirlisting.patch
signature.asc
Description: This is a digitally signed message part
