lp:~robru/webapps-applications/stop-conflict-with-unity-asset-pool

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:webapps-applications at revision 569

PS Jenkins bot (community): Approve (continuous-integration) on 2013-09-24

Alexandre Abreu (community): Approve on 2013-09-24

Diff: 221 lines (+42/-61)

11 files modified

configure.ac (+0/-4)
debian/control (+3/-0)
debian/rules (+1/-1)
debian/unity-webapps-common.install (+1/-1)
default-apps/Makefile.am (+1/-4)
default-apps/icon-themes/Makefile.am (+0/-5)
default-apps/icon-themes/unity-webapps-applications/Makefile.am (+0/-1)
default-apps/icon-themes/unity-webapps-applications/apps/128/Makefile.am (+0/-8)
default-apps/icon-themes/unity-webapps-applications/apps/Makefile.am (+0/-1)
default-apps/icon-themes/unity-webapps-applications/index.theme (+0/-36)
default-apps/index.theme (+36/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1218490: unity-webapps-common package breaks upgrades

Critical

Fix Released

Link a bug report

Related blueprints

571. By Robert Bruce Park on 2013-09-24

Resurrect index.theme

570. By Robert Bruce Park on 2013-09-24

Drop icons that conflict with unity-asset-pool.

569. By Robert Bruce Park on 2013-09-24

Fix some lintian warnings about python usage.

568. By PS Jenkins bot on 2013-09-21

Releasing 2.4.17+13.10.20130920.3-0ubuntu1 (revision 567 from lp:webapps-applications).

Approved by PS Jenkins bot.

567. By Justin McPherson on 2013-09-20

Abort early if test injection code has been run.
. Fixes: https://bugs.launchpad.net/bugs/1227934.

Approved by PS Jenkins bot, Alexandre Abreu.

566. By PS Jenkins bot on 2013-09-17

Releasing 2.4.17+13.10.20130917.1-0ubuntu1 (revision 565 from lp:webapps-applications).

Approved by PS Jenkins bot.

565. By Robert Bruce Park on 2013-09-16

Breaks: old amazon package.

Approved by PS Jenkins bot, Alexandre Abreu.

564. By Robert Bruce Park on 2013-09-14

Version bump, 2.4.17.

Approved by PS Jenkins bot, Robert Bruce Park, Alexandre Abreu.

563. By Alexandre Abreu on 2013-09-11

Add webapps common migration step.

Approved by PS Jenkins bot, Robert Bruce Park.

562. By Alexandre Abreu on 2013-09-10

Add --app-id to the amazon & u1 desktop exec so that the runner can properly pass it down to the webbrowser-app container & properly set APP_ID at startup. For other 'named' webapps launch this is not necessary since the name & domains are used to infer the app-id.
.

Approved by PS Jenkins bot.