Merge lp://qastaging/~mvo/webapps-applications/whitelist-webapps into lp://qastaging/ubuntu/quantal/webapps-applications
Proposed by
Michael Vogt
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~mvo/webapps-applications/whitelist-webapps |
| Merge into: | lp://qastaging/ubuntu/quantal/webapps-applications |
| Diff against target: |
343 lines (+178/-0) (has conflicts) 13 files modified
configure (+37/-0) configure.ac (+4/-0) debian/aptdaemon-trust-webapps.cfg (+4/-0) debian/changelog (+38/-0) debian/com.canonical.unity.webapps.pkla (+4/-0) debian/control (+6/-0) debian/patches/disable-tests.patch (+12/-0) debian/patches/dont-add-launchers-on-edubuntu (+20/-0) debian/patches/migration-script.patch (+46/-0) debian/patches/series (+3/-0) debian/source/format (+1/-0) debian/unity-webapps-common.install (+2/-0) debian/unity-webapps-common.migrations (+1/-0) Text conflict in configure Text conflict in configure.ac Text conflict in debian/changelog Text conflict in debian/control Conflict adding file debian/patches. Moved existing file to debian/patches.moved. Conflict adding file debian/source. Moved existing file to debian/source.moved. Conflict adding file debian/unity-webapps-common.migrations. Moved existing file to debian/unity-webapps-common.migrations.moved. |
| To merge this branch: | bzr merge lp://qastaging/~mvo/webapps-applications/whitelist-webapps |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexandre Abreu | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-10-01.
Description of the change
This add support to skip the prompting.
To post a comment you must log in.
Revision history for this message
| Alexandre Abreu (abreu-alexandre) | # |
review:
Approve
Unmerged revisions
- 123. By Michael Vogt
-
add .pkla and aptdaemon cfg to allow passwordless installs of webapps
- 122. By Stéphane Graber
-
releasing version 2.4.6-0ubuntu3
- 121. By Michael Terry
-
* debian/
patches/ migration- script. patch,
debian/unity-webapps- common. migrations:
- Add patch from upstream to migrate existing users to have the same
webapps in the launcher that default users get. - 120. By Michael Terry
-
add source format
- 119. By Michael Terry
-
use arch: all
- 118. By Michael Terry
-
revert configure to tarball version
- 117. By Michael Terry
-
mark for quantal-proposed
- 116. By Michael Terry
-
Change source name to match upstream
- 115. By Michael Terry
-
* debian/
patches/ disable- tests.patch:
- Make sure to disable tests during build, so that we don't need gjs - 114. By Michael Terry
-
bump to 2.4.6
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
