Merge lp://qastaging/~ted/indicator-appmenu/hudectomy into lp://qastaging/indicator-appmenu/13.04

Proposed by Ted Gould
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 231
Merged at revision: 233
Proposed branch: lp://qastaging/~ted/indicator-appmenu/hudectomy
Merge into: lp://qastaging/indicator-appmenu/13.04
Diff against target: 15191 lines (+5/-14591)
101 files modified
Makefile.am (+2/-4)
configure.ac (+0/-24)
data/Makefile.am (+1/-12)
data/com.canonical.hud.service.in (+0/-3)
data/com.canonical.indicator.appmenu.hud.gschema.xml (+0/-16)
data/com.canonical.indicator.appmenu.hud.search.gschema.xml (+0/-72)
debian/control (+1/-6)
debian/indicator-appmenu-tools.install (+0/-7)
debian/indicator-appmenu.install (+0/-2)
docs/HUD Architecture.svg (+0/-368)
docs/Makefile.am (+0/-1)
docs/devel/Makefile.am (+0/-36)
docs/devel/hud-docs.xml (+0/-58)
docs/devel/hud-overview.xml (+0/-91)
docs/devel/hud-sections.txt (+0/-172)
docs/devel/hud.types (+0/-11)
docs/man/Makefile.am (+0/-16)
docs/man/hud-cli.xml (+0/-38)
docs/man/hud-dump-application.xml (+0/-45)
docs/man/hud-list-applications.xml (+0/-44)
docs/man/hud-verify-app-info.xml (+0/-35)
po/POTFILES.in (+0/-22)
src/Makefile.am (+1/-179)
src/create-db.h (+0/-4)
src/create-db.sql (+0/-2)
src/dump-app-info.c (+0/-174)
src/dump-app-info.h (+0/-30)
src/hud-cli.c (+0/-237)
src/hud-dump-application.c (+0/-73)
src/hud-list-applications (+0/-11)
src/hud-service.c (+0/-335)
src/hud-verify-app-info.c (+0/-100)
src/hud.xml (+0/-37)
src/hudappindicatorsource.c (+0/-432)
src/hudappindicatorsource.h (+0/-36)
src/hudappmenuregistrar.c (+0/-507)
src/hudappmenuregistrar.h (+0/-53)
src/huddbusmenucollector.c (+0/-679)
src/huddbusmenucollector.h (+0/-48)
src/huddebugsource.c (+0/-168)
src/huddebugsource.h (+0/-36)
src/hudindicatorsource.c (+0/-286)
src/hudindicatorsource.h (+0/-36)
src/huditem.c (+0/-343)
src/huditem.h (+0/-79)
src/hudmenumodelcollector.c (+0/-757)
src/hudmenumodelcollector.h (+0/-46)
src/hudquery.c (+0/-319)
src/hudquery.h (+0/-50)
src/hudresult.c (+0/-310)
src/hudresult.h (+0/-48)
src/hudsettings.c (+0/-128)
src/hudsettings.h (+0/-43)
src/hudsource.c (+0/-173)
src/hudsource.h (+0/-57)
src/hudsourcelist.c (+0/-165)
src/hudsourcelist.h (+0/-39)
src/hudstringlist.c (+0/-227)
src/hudstringlist.h (+0/-40)
src/hudtoken.c (+0/-406)
src/hudtoken.h (+0/-43)
src/hudwebappsource.c (+0/-376)
src/hudwebappsource.h (+0/-36)
src/hudwindowsource.c (+0/-372)
src/hudwindowsource.h (+0/-37)
src/load-app-info.c (+0/-319)
src/load-app-info.h (+0/-30)
src/shared-values.h (+0/-33)
tests/Makefile.am (+0/-447)
tests/bad-app-info/dual-headers.hud-app-info (+0/-3)
tests/bad-app-info/item-no-count.hud-app-info (+0/-8)
tests/bad-app-info/item-no-name.hud-app-info (+0/-8)
tests/bad-app-info/menu-no-name.hud-app-info (+0/-8)
tests/bad-app-info/missing-desktop.hud-app-info (+0/-7)
tests/bad-app-info/missing-menus.hud-app-info (+0/-6)
tests/bad-app-info/multiple-menus.hud-app-info (+0/-13)
tests/good-app-info/testapp.desktop.hud-app-info (+0/-8)
tests/good-app-info/testapp100.desktop.hud-app-info (+0/-8)
tests/good-app-info/tons-of-entries.hud-app-info (+0/-143)
tests/hud-performance.c (+0/-278)
tests/run-xvfb.sh (+0/-7)
tests/test-app-indicator.c (+0/-65)
tests/test-bad-app-info.c (+0/-100)
tests/test-dbus-message-count-send-query (+0/-4)
tests/test-dbus-message-count.in (+0/-18)
tests/test-dbus-message-count.json (+0/-2928)
tests/test-distance.c (+0/-267)
tests/test-load-app-info.c (+0/-82)
tests/test-result-highlighting.c (+0/-198)
tests/test-usage-db-ancient.c (+0/-39)
tests/test-usage-db-ancient.sql (+0/-7)
tests/test-usage-db-old.c (+0/-80)
tests/test-usage-db-old.sql (+0/-11)
tests/test-usage-db-simple.c (+0/-106)
tests/test-usage-db-simple.sql (+0/-11)
tests/test-usage-db-testapp.c (+0/-80)
tests/test-usage-dump-entries.sql (+0/-1)
tests/word-list.h (+0/-364)
tools-vala/Makefile.am (+0/-24)
tools-vala/hud-gtk.ui (+0/-119)
tools-vala/hud-gtk.vala (+0/-121)
To merge this branch: bzr merge lp://qastaging/~ted/indicator-appmenu/hudectomy
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Charles Kerr (community) Approve
Review via email: mp+131237@code.qastaging.launchpad.net

Commit message

Remove the HUD files from indicator-appmenu

Description of the change

We've move the HUD to lp:hud. It shouldn't be here anymore.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Cool.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Legit CI failure above, packaging needs to be updated:

dh_install --fail-missing
dh_install: indicator-appmenu missing files (debian/tmp/usr/lib/*/hud-service), aborting
make[1]: *** [override_dh_install] Error 2
make[1]: Leaving directory `/tmp/buildd/indicator-appmenu-12.10.4daily12.11.23'
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
E: Failed autobuilding of package

cyphermox advocates editing debian/indicator-appmenu.install to remove this expectation of finding the removed built files.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches