[Forensics-changes] [SCM] debian-forensics/guymager branch, debian, updated. debian/0.6.7-2-4-g3630afc

Michael Prokop mika at grml.org
Thu Jun 7 15:42:09 UTC 2012


The following commit has been merged in the debian branch:
commit 136b5d8e6d4fc54a0b889255355941f757a41c6d
Author: Michael Prokop <mika at grml.org>
Date:   Thu Jun 7 17:19:38 2012 +0200

    Adjust ThreadScanLibPartedSearchDirs of threadscan.cpp during package build
    
    This is ugly but the only chance I see to support multiarch
    without hardcoding all possible directories in the source itself
    until guymager is more flexible in finding libparted.

diff --git a/debian/rules b/debian/rules
index 6483176..93c13f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	qmake-qt4 DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR_QT=\'\\\"/usr/share/qt4/translations\\\"\'"
+	# ugly but only chance to find libparted in guymager :-/
+	sed -i "s/^const QString ThreadScanLibPartedSearchDirs.*/const QString ThreadScanLibPartedSearchDirs    = \\\"\/lib,\/lib\/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH),\/usr\/lib,\/usr\/local\/lib\\\";       \/\/ Separate directories by commas/" threadscan.cpp
 	touch configure-stamp
 
 build: build-stamp

-- 
debian-forensics/guymager



More information about the forensics-changes mailing list