qtcreator-plugin-ubuntu

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

  1. save_apparmor_manifest
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Merged
Approved by: Zsombor Egri
Approved revision: 49
Merged at revision: 48
Proposed branch: lp:~bzoltan/qtcreator-plugin-ubuntu/save_apparmor_manifest
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 28 lines (+7/-0)
2 files modified
debian/changelog (+3/-0)
src/ubuntu/ubuntupackagingwidget.cpp (+4/-0)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-ubuntu/save_apparmor_manifest
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Jamie Strandboge Pending
Timo Jyrinki Pending
Review via email: mp+188602@code.launchpad.net

Commit message

Saving the AppArmor manifest file when Click package is created (LP: #1233683)

Description of the change

Saving the AppArmor manifest file when Click package is created (LP: #1233683)

To post a comment you must log in.
lp:~bzoltan/qtcreator-plugin-ubuntu/save_apparmor_manifest updated
49. By Zoltan Balogh

attache bug ID

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/61

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/62

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

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Thanks for all da fish :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-09-30 16:20:27 +0000
3+++ debian/changelog 2013-10-01 14:44:43 +0000
4@@ -20,6 +20,9 @@
5 [ Maxim Ermilov ]
6 * Fixed CordovaUbuntuProjectManager to compile against Qt Creator 2.8
7
8+ [ Zoltán Balogh ]
9+ * Saving the AppArmor manifest file when Click package is created (LP: #1233683)
10+
11 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 23 Sep 2013 10:01:41 +0300
12
13 qtcreator-plugin-ubuntu (2.7.2-0ubuntu5) saucy; urgency=low
14
15=== modified file 'src/ubuntu/ubuntupackagingwidget.cpp'
16--- src/ubuntu/ubuntupackagingwidget.cpp 2013-09-27 11:59:31 +0000
17+++ src/ubuntu/ubuntupackagingwidget.cpp 2013-10-01 14:44:43 +0000
18@@ -204,6 +204,10 @@
19 }
20 m_apparmor.setPolicyGroups(m_projectName,items);
21 m_manifest.save();
22+ m_apparmor.setRaw(ui->plainTextEditAppArmorJson->toPlainText());
23+ m_apparmor.save();
24+ save_excludes();
25+
26 break;
27 }
28 case 1: {

Subscribers

People subscribed via source and target branches

to all changes: