-
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.