[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.6.7-3-6-gfed5ff0

[Michael Prokop]

The following commit has been merged in the debian branch:
commit 110a6cd8cf45fe8b93a40c86b23f64e76c69adc1
Author: Michael Prokop <mika at debian.org>
Date:   Fri Mar 29 11:07:10 2013 +0100

    Refresh debian/patches/ against new upstream release

diff --git a/debian/patches/01_do-not-statically-compile-against-libs.diff b/debian/patches/01_do-not-statically-compile-against-libs.diff
index 05e6905..2903e72 100644
--- a/debian/patches/01_do-not-statically-compile-against-libs.diff
+++ b/debian/patches/01_do-not-statically-compile-against-libs.diff
@@ -4,7 +4,7 @@ Last-Updated: 2012-03-01
 
 --- a/guymager.pro
 +++ b/guymager.pro
-@@ -137,8 +137,8 @@
+@@ -147,8 +147,8 @@
  #LIBS += -lewf
  #LIBS += -lguytools
  #LIBS += /usr/local/lib/libewf.a
diff --git a/debian/patches/fix_sysconf_build_failure.diff b/debian/patches/fix_sysconf_build_failure.diff
index 9fc61b7..531eb79 100644
--- a/debian/patches/fix_sysconf_build_failure.diff
+++ b/debian/patches/fix_sysconf_build_failure.diff
@@ -4,9 +4,9 @@ Last-Updated: 2012-05-08
 
 --- a/util.cpp
 +++ b/util.cpp
-@@ -28,6 +28,8 @@
+@@ -30,6 +30,8 @@
  
- #include "common.h"
+ #include <unistd.h>
  
 +#include <unistd.h>
 +
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
index 6af6939..b1abfe1 100644
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -5,39 +5,9 @@
  #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>
---- a/media.cpp
-+++ b/media.cpp
-@@ -29,6 +29,7 @@
- // along with guymager. If not, see <http://www.gnu.org/licenses/>.
- 
- #include <stdlib.h>
-+#include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/ioctl.h>
---- a/table.cpp
-+++ b/table.cpp
-@@ -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"
---- a/threadread.cpp
-+++ b/threadread.cpp
-@@ -27,6 +27,7 @@
- // along with guymager. If not, see <http://www.gnu.org/licenses/>.
- 
- #include <errno.h>
-+#include <unistd.h>
- 
- #include <QtCore>
- 
 --- a/aewf.cpp
 +++ b/aewf.cpp
 @@ -46,21 +46,6 @@
@@ -48,7 +18,7 @@
 -// ------------------
 -
 -// 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. 
+-// The following lines implement conversin for uchar and avoid the problems.
 -
 -#if (QT_VERSION < 0x040800)
 -   template <typename T> T qbswap(T source);
diff --git a/debian/patches/reenable_libguytools_and_libewf.diff b/debian/patches/reenable_libguytools_and_libewf.diff
index fb82bbc..c108cc0 100644
--- a/debian/patches/reenable_libguytools_and_libewf.diff
+++ b/debian/patches/reenable_libguytools_and_libewf.diff
@@ -1,6 +1,6 @@
 --- a/guymager.pro
 +++ b/guymager.pro
-@@ -134,8 +134,8 @@
+@@ -144,8 +144,8 @@
  QMAKE_LFLAGS_DEBUG     += -ggdb -rdynamic    # -rdynamic is necessary in order to have the backtrace handler in toolsignal show all information
  QMAKE_LFLAGS_RELEASE   += -ggdb -rdynamic    # -rdynamic is necessary in order to have the backtrace handler in toolsignal show all information
  

-- 
debian-forensics/guymager