← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xscreensaver/trusty

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-11-30 13:33:13 UTC
  • mfrom: (1.1.8 upstream) (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091130133313-3b5nz2e7hvbb8h3l
Tags: 5.10-3ubuntu1
https://launchpad.net/bugs/489062
* Merge with Debian unstable, remaining changes: (LP: #489062)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
252
252
 
253
253
    AC_OUTPUT_COMMANDS(
254
254
      [case "$CONFIG_FILES" in *po/Makefile.in*)
 
255
        rm -f po/stamp-it po/stamp-it.tmp
 
256
        > po/stamp-it.tmp
255
257
        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
 
258
        mv po/stamp-it.tmp po/stamp-it
256
259
      esac])
257
260
 
258
261
    dnl These rules are solely for the distribution goal.  While doing this