Merge lp:~bzoltan/qtcreator-plugin-ubuntu/fix_1274265 into lp:qtcreator-plugin-ubuntu

[Zoltan Balogh]

Remove forced update of the maintainer in the manifest.json (Fixes: #1274265)

This single line changes seems to fix #1274265

The maintainer field of the manifest.json should not be forced to the bzr identity.

It might be better idea to offer to the developer to choose from various identity.

[Zoltan Balogh (bzoltan)]

https://bugs.launchpad.net/qtcreator-plugin-ubuntu/+bug/1274265

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/113/rebuild

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

Looks goods , ready to merge

review: Approve

=== modified file 'src/ubuntu/ubuntupackagingwidget.cpp'
--- src/ubuntu/ubuntupackagingwidget.cpp	2014-01-28 18:30:42 +0000
+++ src/ubuntu/ubuntupackagingwidget.cpp	2014-01-30 19:25:56 +0000
@@ -280,11 +280,11 @@
 
 void UbuntuPackagingWidget::load_manifest(QString fileName) {
     m_manifest.load(fileName,m_projectName);
-    m_manifest.setMaintainer(m_bzr.whoami());
+    // Commented out for bug #1274265 https://bugs.launchpad.net/qtcreator-plugin-ubuntu/+bug/1274265
+    //m_manifest.setMaintainer(m_bzr.whoami());
     QString userName = m_bzr.launchpadId();
     if (userName.isEmpty()) userName = QLatin1String(Constants::USERNAME);
     m_projectName.replace(QLatin1String(Constants::UNDERLINE),QLatin1String(Constants::DASH));
-
     // Commented out for bug #1219948  - https://bugs.launchpad.net/qtcreator-plugin-ubuntu/+bug/1219948
     //m_manifest.setName(QString(QLatin1String("com.ubuntu.developer.%0.%1")).arg(userName).arg(m_projectName));
 }