[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.5.9-1-4-g34d0617

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 43544beaf3b94ec7a105737c5cd6e49d9f1d9e10
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jan 7 15:40:35 2012 +0100

    Fix FTBFS by linking to libproc-ng rather than libproc (Closes: #652170)

diff --git a/debian/changelog b/debian/changelog
index 691a34c..69aa22b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+guymager (0.5.9-2) unstable; urgency=low
+
+  * Team upload.
+  * Fix FTBFS by linking to libproc-ng rather than libproc (Closes: #652170) 
+
+ -- Julien Valroff <julien at debian.org>  Sat, 07 Jan 2012 15:39:43 +0100
+
 guymager (0.5.9-1) unstable; urgency=low
 
   * Merging upstream version 0.5.9.
diff --git a/debian/patches/01_do-not-statically-compile-against-libs.dpatch b/debian/patches/01_do-not-statically-compile-against-libs.dpatch
index 7217bde..4f240d9 100755
--- a/debian/patches/01_do-not-statically-compile-against-libs.dpatch
+++ b/debian/patches/01_do-not-statically-compile-against-libs.dpatch
@@ -5,18 +5,19 @@
 ## DP: do not statically compile against libewf and libguytools
 
 @DPATCH@
-diff --git a/guymager.pro b/guymager.pro
-index 1f1b18f..7d29a55 100644
---- a/guymager.pro
-+++ b/guymager.pro
-@@ -139,10 +139,10 @@ fastasm.commands = g++ -c $$FAST_ASM_CXXFLAGS ${QMAKE_FILE_IN} -o  ${QMAKE_FILE_
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' guymager~/guymager.pro guymager/guymager.pro
+--- guymager~/guymager.pro	2012-01-07 15:20:44.000000000 +0100
++++ guymager/guymager.pro	2012-01-07 15:39:26.808021108 +0100
+@@ -140,11 +140,11 @@
+ fastasm.commands = g++ -c $$FAST_ASM_CXXFLAGS ${QMAKE_FILE_IN} -o  ${QMAKE_FILE_BASE}.o 2>&1 | grep -vE \"matching constraint does not allow a register|In function |At global scope:\"  | cat
  QMAKE_EXTRA_COMPILERS += fastasm
  
- LIBS += -lproc
+-LIBS += -lproc
 -#LIBS += -lewf
 -#LIBS += -lguytools
 -LIBS += /usr/lib/libewf.a
 -LIBS += /usr/lib/libguytools.a
++LIBS += -lproc-ng
 +LIBS += -lewf
 +LIBS += -lguytools
 +#LIBS += /usr/lib/libewf.a

-- 
debian-forensics/guymager