Application Menu Indicator

Merge lp:~charlesk/indicator-appmenu/lp-938986 into lp:indicator-appmenu/0.4

  1. lp-938986
  2. Merge into trunk.0.4
Proposed by Charles Kerr
Status: Merged
Approved by: Charles Kerr
Approved revision: 168
Merged at revision: 167
Proposed branch: lp:~charlesk/indicator-appmenu/lp-938986
Merge into: lp:indicator-appmenu/0.4
Diff against target: 17 lines (+1/-1)
2 files modified
po/POTFILES.in (+0/-1)
po/POTFILES.skip (+1/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-appmenu/lp-938986
Reviewer Review Type Date Requested Status
Allan LeSage Approve
Ted Gould Pending
Review via email: mp+95943@code.launchpad.net

This proposal supersedes a proposal from 2012-03-04.

Description of the change

Don't mark hud.interface.c for translation.

When building with srcdir != builddir, "make check" fails in po/ because make is looking for hud.interface.c in the srcdir, but it's a built source and so it's in the builddir. This raises an interesting (to me, at least) question about how to get POTFILES.in to understand where to look for files generated from BUILT_SOURCES -- but, for the purposes of indicator-appmenu, there is a shorter path to a fix: nothing in hud.interface.c needs translation, so remove it from POTFILES.in to fix "make check."

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote : Posted in a previous version of this proposal

On Sun, 2012-03-04 at 19:14 +0000, charles wrote:
> When building with srcdir != builddir, "make check" fails in po/
> because make is looking for hud.interface.c in the srcdir, but it's a
> built source and so it's in the builddir. This raises an interesting
> (to me, at least) question about how to get POTFILES.in to understand
> where to look for files generated from BUILT_SOURCES -- but, for the
> purposes of indicator-appmenu, there is a shorter path to a fix:
> nothing in hud.interface.c needs translation, so remove it from
> POTFILES.in to fix "make check."

Ah, nice. I think that it probably needs to be added to POTFILES.skip
or otherwise distcheck will complain about it.

  review needs-fixing

review: Needs Fixing
Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

Good catch, thanks

Revision history for this message
Charles Kerr (charlesk) wrote : Posted in a previous version of this proposal

Hmm. Oddly enough, "make distcheck" works with or without hud.interface.c in POTFILES.skip... but it's still the right thing to do here; added in r168

Revision history for this message
Allan LeSage (allanlesage) wrote :

Confirmed that this change has the effect of fixing the pdebuild.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/POTFILES.in'
2--- po/POTFILES.in 2012-01-26 16:26:53 +0000
3+++ po/POTFILES.in 2012-03-05 16:54:19 +0000
4@@ -6,7 +6,6 @@
5 src/hud-dbus.c
6 src/menuitem-collector.c
7 src/usage-tracker.c
8-src/hud.interface.c
9 src/hud-search.c
10 src/hud-cli.c
11 src/distance.c
12
13=== added file 'po/POTFILES.skip'
14--- po/POTFILES.skip 1970-01-01 00:00:00 +0000
15+++ po/POTFILES.skip 2012-03-05 16:54:19 +0000
16@@ -0,0 +1,1 @@
17+src/hud.interface.c

Subscribers

People subscribed via source and target branches