[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.4.2-2-11-g7087b21

[Michael Prokop]

The following commit has been merged in the debian branch:
commit 10caca8430c7931f1afe0142622868d60a4ef7c7
Author: Michael Prokop <mika at debian.org>
Date:   Mon Jun 14 17:36:59 2010 +0200

    Add + integrate debian/patches/01_do-not-statically-compile-against-libs.dpatch.

diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..8bee6c6
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_do-not-statically-compile-against-libs.dpatch
diff --git a/debian/patches/01_do-not-statically-compile-against-libs.dpatch b/debian/patches/01_do-not-statically-compile-against-libs.dpatch
new file mode 100755
index 0000000..7217bde
--- /dev/null
+++ b/debian/patches/01_do-not-statically-compile-against-libs.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## do-not-statically-compile-against-libs.dpatch by Michael Prokop <mika at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: do not statically compile against libewf and libguytools
+
+ at 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_
+ QMAKE_EXTRA_COMPILERS += fastasm
+ 
+ LIBS += -lproc
+-#LIBS += -lewf
+-#LIBS += -lguytools
+-LIBS += /usr/lib/libewf.a
+-LIBS += /usr/lib/libguytools.a
++LIBS += -lewf
++LIBS += -lguytools
++#LIBS += /usr/lib/libewf.a
++#LIBS += /usr/lib/libguytools.a
+ LIBS += -lz
+ LIBS += -ldl
+ 
diff --git a/debian/rules b/debian/rules
index f5d3b2b..9566177 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	qmake-qt4 DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR_QT=\'\\\"/usr/share/qt4/translations\\\"\'"
 	touch configure-stamp
@@ -24,7 +33,7 @@ build-stamp: configure-stamp
 	cd manuals  && ./rebuild.sh && cd -
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

-- 
debian-forensics/guymager