-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2009-06-03 18:41:32 UTC
-
mfrom:
(1.1.5 upstream)
(2.2.1 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090603184132-znjy66pq9xom7hac
Tags: 0.9.0-2ubuntu1
* Merge from debian unstable, remaining changes:
- Drop dependency on openal. It is not enabled by default anyway, and
allows openal to migrate to universe.
- src/skyrocket.{cpp,xml}: Disable sound by default.
- Add --disable-sound configure flag to debian/rules, as we don't keep
the dependencies on openal nor freeglut (both universe packages).
* Dropped changes, merged upstream:
- other_src/Makefile.am: fix the upstream build rules to actually use
the ImageMagick CFLAGS returned by pkg-config.
- Move the unconditional ImageMagick check up in configure.in so that
our first PKG_CHECK_MODULES() call isn't hidden behind a shell
conditional.