Commit 31189a60 authored by ck's avatar ck
Browse files

Maemo: Revert change accidentally introduced by merge.

parent 7535e9bb
......@@ -199,6 +199,10 @@ bool MaemoPackageCreationStep::createPackage()
rulesContents.replace("DESTDIR", "INSTALL_ROOT");
rulesContents.replace("dh_shlibdeps", "# dh_shlibdeps");
// Would be the right solution, but does not work (on Windows),
// because dpkg-genchanges doesn't know about it (and can't be told).
// rulesContents.replace("dh_builddeb", "dh_builddeb --destdir=.");
rulesFile.resize(0);
rulesFile.write(rulesContents);
if (rulesFile.error() != QFile::NoError) {
......@@ -220,7 +224,7 @@ bool MaemoPackageCreationStep::createPackage()
}
}
if (!runCommand(QLatin1String("dh_installdirs")))
if (!runCommand(QLatin1String("dpkg-buildpackage -nc -uc -us")))
return false;
// Workaround for non-working dh_builddeb --destdir=.
......@@ -244,22 +248,6 @@ bool MaemoPackageCreationStep::createPackage()
.arg(packageSourceDir, buildDir));
return false;
}
if (!QFile::copy(d.localFilePath, targetFile)) {
raiseError(tr("Packaging Error: Could not copy '%1' to '%2'.")
.arg(QDir::toNativeSeparators(d.localFilePath))
.arg(QDir::toNativeSeparators(targetFile)));
return false;
}
}
const QStringList commands = QStringList() << QLatin1String("dh_link")
<< QLatin1String("dh_fixperms") << QLatin1String("dh_installdeb")
<< QLatin1String("dh_gencontrol") << QLatin1String("dh_md5sums")
<< QLatin1String("dh_builddeb --destdir=.");
foreach (const QString &command, commands) {
if (!runCommand(command))
return false;
}
emit addOutput(tr("Package created."), BuildStep::MessageOutput);
......
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