Merge lp:~larsu/indicator-messages/lp1060618 into lp:indicator-messages/12.10

Proposed by Lars Karlitski
Status: Merged
Approved by: Charles Kerr
Approved revision: 321
Merged at revision: 321
Proposed branch: lp:~larsu/indicator-messages/lp1060618
Merge into: lp:indicator-messages/12.10
Diff against target: 11 lines (+1/-1)
1 file modified
data/icons/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~larsu/indicator-messages/lp1060618
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+127636@code.launchpad.net

Commit message

Call gtk-update-icon-cache on $(datadir)/icons/hicolor

That's were icons are installed, not $(pkgdatadir).

Description of the change

Call gtk-update-icon-cache on $(datadir)/icons/hicolor

That's were icons are installed, not $(pkgdatadir).

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

Looks good!

review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/icons/Makefile.am'
2--- data/icons/Makefile.am 2009-02-04 16:01:51 +0000
3+++ data/icons/Makefile.am 2012-10-03 05:53:21 +0000
4@@ -1,6 +1,6 @@
5 SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
6
7-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
8+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
9
10 install-data-hook: update-icon-cache
11 uninstall-hook: update-icon-cache

Subscribers

People subscribed via source and target branches