Commit b21523f9 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Don't call dh_make directly, go via the "mad" script.

This simplifies the call and also fixes a bug along the way.

Task-number: QTCREATORBUG-3589
parent ede49086
......@@ -700,11 +700,12 @@ AbstractQt4MaemoTarget::ActionStatus AbstractDebBasedQt4MaemoTarget::createSpeci
const QString dhMakeDebianDir = projectDir.path() + QLatin1Char('/')
+ PackagingDirName + QLatin1String("/debian");
MaemoGlobal::removeRecursively(dhMakeDebianDir, error);
const QString command = QLatin1String("dh_make -s -n -p ")
+ defaultPackageFileName() + QLatin1Char('_')
+ MaemoPackageCreationStep::DefaultVersionNumber;
dh_makeProc.start(MaemoPackageCreationStep::packagingCommand(bc, command));
if (!dh_makeProc.waitForStarted()) {
const QStringList dh_makeArgs = QStringList() << QLatin1String("dh_make")
<< QLatin1String("-s") << QLatin1String("-n") << QLatin1String("-p")
<< (defaultPackageFileName() + QLatin1Char('_')
+ MaemoPackageCreationStep::DefaultVersionNumber);
if (!MaemoGlobal::callMad(dh_makeProc, dh_makeArgs, activeBuildConfiguration()->qtVersion(), true)
|| !dh_makeProc.waitForStarted()) {
raiseError(tr("Unable to create Debian templates: dh_make failed (%1)")
.arg(dh_makeProc.errorString()));
return ActionFailed;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment