~ubuntu-branches/ubuntu/quantal/debconf/quantal

« back to all changes in this revision

Viewing changes to po/Makefile

  • Committer: Colin Watson
  • Date: 2012-08-16 17:29:41 UTC
  • mfrom: (25.1.22 sid)
  • Revision ID: cjwatson@canonical.com-20120816172941-9d1zubqn5zb0i50x
merge from Debian 1.5.46

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
 
27
27
%.po: debconf.pot
28
28
        @echo -n "Merging debconf.pot and $@"
29
 
        @msgmerge $@ debconf.pot -o $@.new
 
29
        @msgmerge --previous $@ debconf.pot -o $@.new
30
30
# Typically all that changes was a date or line number. I'd prefer not to
31
31
# commit such changes, so detect and ignore them.
32
32
        @if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \