Maemo: Fix newlines in debian files when publishing.

The build server does not like CRLF.

2 files changed, 25 insertions, 0 deletions

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
index e1e9f65885..c93c32ba44 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.cpp
@@ -138,6 +138,11 @@ void MaemoPublisherFremantleFree::createPackage()
             tr("Publishing failed: Could not create source package."));
         return;
     }
+    if (!fixNewlines()) {
+        finishWithFailure(tr("Error: Could not fix newlines"),
+            tr("Publishing failed: Could not create source package."));
+        return;
+    }
 
     QString error;
     if (!updateDesktopFiles(&error)) {
@@ -223,6 +228,25 @@ bool MaemoPublisherFremantleFree::copyRecursively(const QString &srcFilePath,
     return true;
 }
 
+bool MaemoPublisherFremantleFree::fixNewlines()
+{
+    QDir debianDir(m_tmpProjectDir + QLatin1String("/debian"));
+    const QStringList &fileNames = debianDir.entryList(QDir::Files);
+    foreach (const QString &fileName, fileNames) {
+        QFile file(debianDir.filePath(fileName));
+        if (!file.open(QIODevice::ReadWrite))
+            return false;
+        QByteArray contents = file.readAll();
+        const QByteArray crlf("\r\n");
+        if (!contents.contains(crlf))
+            continue;
+        contents.replace(crlf, "\n");
+        file.resize(0);
+        file.write(contents);
+    }
+    return true;
+}
+
 void MaemoPublisherFremantleFree::handleProcessError(QProcess::ProcessError error)
 {
     if (error == QProcess::FailedToStart)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
index 8fa98a2120..c075bc4d12 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopublisherfremantlefree.h
@@ -90,6 +90,7 @@ private:
     void uploadPackage();
     bool copyRecursively(const QString &srcFilePath,
         const QString &tgtFilePath);
+    bool fixNewlines();
     void handleProcessFinished(bool failedToStart);
     void runDpkgBuildPackage();
     QString tmpDirContainer() const;