From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 3 Dec 2010 15:57:25 +0000 (+0100)
Subject: Maemo: Manually add "execute" bit to debian/rules file.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31422318d638d8457d872ce1e7a4311ec78de87c;p=qt-creator-jp%2Fqt-creator-jp.git

Maemo: Manually add "execute" bit to debian/rules file.

The file is expected to be executable on Linux. However, when it
was created on Windows and checked into a repository, the
bit will not be set when pulling it onto a Linux system, resulting
in packaging failure.

Task-number: QTCREATORBUG-3277
Reviewed-by: kh1
Reviewed-by: dt
---

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index 2808520c16..871cd461ba 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -263,8 +263,12 @@ bool MaemoPackageCreationStep::copyDebianFiles(bool inSourceBuild)
         }
 
         // Workaround for Harmattan icon bug
-        if (harmattanWorkaroundNeeded && fileName == QLatin1String("rules"))
-            addWorkaroundForHarmattanBug(destFile);
+        if (fileName == QLatin1String("rules")) {
+            if (harmattanWorkaroundNeeded)
+                addWorkaroundForHarmattanBug(destFile);
+            QFile rulesFile(destFile);
+            rulesFile.setPermissions(rulesFile.permissions() | QFile::ExeUser);
+        }
     }
 
     QFile magicFile(magicFilePath);