-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2009-05-01 05:30:24 UTC
-
mfrom:
(1.1.4 upstream)
(2.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20090501053024-32cc712ol1bd9e9j
Tags: 0.8.3-1ubuntu1
* Merge from debian unstable, remaining changes:
- Drop dependency on openal. It is not enabled by default anyway, and
allows openal to migrate to universe.
- reallyslick/cpp_src/skyrocket.{cpp,xml}: Disable sound by default.
- other_src/Makefile.am: fix the upstream build rules to actually use
the ImageMagick CFLAGS returned by pkg-config.
- Add --disable-sound configure flag to debian/rules, as we don't keep
the dependencies on openal nor freeglut (both universe packages).
- Call ./autogen.sh and build-depend on automake/autoconf, since we're
modifying other_src/Makefile.am above.
* Dropped changes, superseded in Debian package:
- debian/control: build-depend on libmagickwand-dev instead of
libmagick9-dev.
* Instead of hard-coding a define of 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.