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

« back to all changes in this revision

Viewing changes to setup.com

  • 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
* 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:
51
51
$ halo          :== $'mydir'halo
52
52
$ helix         :== $'mydir'helix
53
53
$ hopalong      :== $'mydir'hopalong
54
 
$ hyperball     :== $'mydir'hyperball
55
 
$ hypercube     :== $'mydir'hypercube
56
54
$ ifs           :== $'mydir'ifs
57
55
$ imsmap        :== $'mydir'imsmap
58
56
$ interaggregate        :== $'mydir'interaggregate
59
57
$ interference  :== $'mydir'interference
60
58
$ intermomentary        :== $'mydir'intermomentary
61
 
$ juggle        :== $'mydir'juggle
62
59
$ julia         :== $'mydir'julia
63
60
$ kaleidescope  :== $'mydir'kaleidescope
64
61
$ kumppa        :== $'mydir'kumppa