Viewing all changes in revision 5.
- Committer: Bazaar Package Importer
- Date: 2010-01-02 13:18:28 UTC
- mfrom: (2.1.2 squeeze)
- Revision ID: james.westby@ubuntu.com-20100102131828-o4p3gthk8m1dopv5
* 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.
+ 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.
- files added:
- data/levels/_test
- data/levels/pompei
- doc
- files removed:
- data/levels/level-04.lvl
- files modified:
- Magicor.py
expand all
collapse all
added
removed
data/levels/_test/walking_blob.png
data/levels/pompei/B100M801.png
data/levels/pompei/box_3_lindo_fog_halo1.png
data/levels/pompei/box_3_lindo_fog_sinnormal.png
data/levels/pompei/decor-hcenter.png
data/levels/pompei/decor-left.png
data/levels/pompei/decor-right.png
data/levels/pompei/huevospline_3_lindo_fog_b.png
data/levels/pompei/huevospline_3_lindo_leopard_detail_0_doble(unrot)_noshadow.png
data/levels/pompei/rect_cz_touched_2c3.png
data/levels/pompei/tile-hmosaic.png
data/levels/snow/i1.png
data/levels/snow/ice3.png
data/levels/snow/snow.png
data/levels/snow/snowman.png
data/levels/snow/snowtop.png
data/sprites/ball_b.png
data/sprites/lava.png
data/sprites/player-penguin.png
data/sprites/seeker3x18.png
data/sprites/spiting_lava.png
data/sprites/trapola.png
data/sprites/trapola2_q.png
data/sprites/trapola2b_exp.png
doc/blob.png
doc/dormant-lava.png
doc/fire.png
doc/ice.png
doc/lava.png
doc/player.png
doc/scarab.png
doc/screenshot01.png
doc/screenshot02.png
doc/screenshot03.png
doc/screenshot04.png
doc/screenshot05.png
doc/screenshot06.png
doc/screenshot07.png
doc/screenshot08.png
doc/screenshot09.png
doc/spikes.png
doc/title.png
