tags 667197 + patch thanks
diff -Nru guymager-0.6.5/debian/changelog guymager-0.6.5/debian/changelog --- guymager-0.6.5/debian/changelog 2012-03-01 14:36:17.000000000 +0000 +++ guymager-0.6.5/debian/changelog 2012-05-04 05:33:04.000000000 +0000 @@ -1,3 +1,10 @@ +guymager (0.6.5-1.1) unstable; urgency=low + + * Non maintainer upload. + * Fix build failure with gcc-4.7. Closes: #667197. + + -- Matthias Klose <[email protected]> Fri, 04 May 2012 07:32:14 +0100 + guymager (0.6.5-1) unstable; urgency=low * Team upload. diff -Nru guymager-0.6.5/debian/patches/ftbfs-gcc-4.7.diff guymager-0.6.5/debian/patches/ftbfs-gcc-4.7.diff --- guymager-0.6.5/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01 00:00:00.000000000 +0000 +++ guymager-0.6.5/debian/patches/ftbfs-gcc-4.7.diff 2012-05-04 05:40:32.000000000 +0000 @@ -0,0 +1,72 @@ +Index: guymager-0.6.5/main.cpp +=================================================================== +--- guymager-0.6.5.orig/main.cpp 2012-03-01 10:59:44.000000000 +0000 ++++ guymager-0.6.5/main.cpp 2012-05-04 05:32:06.323619454 +0000 +@@ -33,6 +33,7 @@ + #include <signal.h> + #include <locale.h> + #include <pwd.h> ++#include <unistd.h> + #include "proc/sysinfo.h" // Required in order to get the amount of memory installed + + #include <QApplication> +Index: guymager-0.6.5/aewf.cpp +=================================================================== +--- guymager-0.6.5.orig/aewf.cpp 2012-03-01 10:59:44.000000000 +0000 ++++ guymager-0.6.5/aewf.cpp 2012-05-04 05:37:02.383630470 +0000 +@@ -46,19 +46,6 @@ + + + // ------------------ +-// Qt +-// ------------------ +- +-// Qt inconsistently defines its little/big endian functions, see QTBUG-21208 on bugreports.qt.nokia.com +-// The following lines implement conversin for uchar and avoid the problems. +- +-template <typename T> T qbswap(T source); +-template <> inline uchar qbswap<uchar>(uchar source) +-{ +- return source; +-} +- +-// ------------------ + // AEWF definitions + // ------------------ + +Index: guymager-0.6.5/media.cpp +=================================================================== +--- guymager-0.6.5.orig/media.cpp 2012-03-01 10:59:44.000000000 +0000 ++++ guymager-0.6.5/media.cpp 2012-05-04 05:38:07.275632886 +0000 +@@ -12,6 +12,7 @@ + // **************************************************************************** + + #include <stdlib.h> ++#include <unistd.h> + #include <fcntl.h> + #include <errno.h> + #include <sys/ioctl.h> +Index: guymager-0.6.5/table.cpp +=================================================================== +--- guymager-0.6.5.orig/table.cpp 2012-03-01 10:59:44.000000000 +0000 ++++ guymager-0.6.5/table.cpp 2012-05-04 05:38:43.507634232 +0000 +@@ -26,6 +26,7 @@ + // You should have received a copy of the GNU General Public License + // along with guymager. If not, see <http://www.gnu.org/licenses/>. + ++#include <unistd.h> + #include <QtGui> + + #include "toolconstants.h" +Index: guymager-0.6.5/threadread.cpp +=================================================================== +--- guymager-0.6.5.orig/threadread.cpp 2012-03-01 10:59:44.000000000 +0000 ++++ guymager-0.6.5/threadread.cpp 2012-05-04 05:39:17.771635508 +0000 +@@ -27,6 +27,7 @@ + // along with guymager. If not, see <http://www.gnu.org/licenses/>. + + #include <errno.h> ++#include <unistd.h> + + #include <QtCore> + diff -Nru guymager-0.6.5/debian/patches/series guymager-0.6.5/debian/patches/series --- guymager-0.6.5/debian/patches/series 2012-03-01 12:49:54.000000000 +0000 +++ guymager-0.6.5/debian/patches/series 2012-05-04 05:31:28.000000000 +0000 @@ -1,2 +1,3 @@ 01_do-not-statically-compile-against-libs.diff 02_adjust_ssl_flags.diff +ftbfs-gcc-4.7.diff
_______________________________________________ forensics-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/forensics-devel
