~ubuntu-branches/ubuntu/vivid/magicor/vivid

« back to all changes in this revision

Viewing changes to debian/magicor-data.install

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2010-01-02 13:18:28 UTC
  • mfrom: (2.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100102131828-o4p3gthk8m1dopv5
Tags: 1.1-1ubuntu1
* Merge with Debian testing. Remaining changes: 
  + debian/control: As Ubuntu's cdbs symlinks identical files, magicor needs
    a strict versioned Depends on magicor-data for the symlinked files to be
    in the same version.
* debian/magicor.install: Update to also work for Python 2.6. 
* debian/magicor.dirs: Unneeded as Makefile.debian creates them too.
* debian/Makefile.debian: Use /usr/share/python/python.mk to determine the
  correct Python library directory.
* debian/control: Update python dependency to >= 2.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
debian/tmp/usr/share/games/magicor/levels/snow/brushes
24
24
debian/tmp/usr/share/games/magicor/levels/snow/*.png
25
25
debian/tmp/usr/share/games/magicor/levels/snow/*.lvl
 
26
debian/tmp/usr/share/games/magicor/levels/snow/*.xm
 
27
debian/tmp/usr/share/games/magicor/levels/pompei/brushes
 
28
debian/tmp/usr/share/games/magicor/levels/pompei/*.png
 
29
debian/tmp/usr/share/games/magicor/levels/pompei/*.lvl
26
30
debian/tmp/usr/share/games/magicor/music/*.xm
27
31
debian/tmp/usr/share/games/magicor/samples/*.wav
28
32
debian/tmp/usr/share/games/magicor/sprites/*.png