« back to all changes in this revision
Viewing changes to debian/desktop_files/biof.desktop
- Committer: Bazaar Package Importer
- 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
* 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.
- 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.
- files added:
- compile
- src/Implicit
- src/colorfire_textures
- src/euphoria_textures
- src/helios_textures
- src/hufo_tunnel_textures
- src/hyperspace_textures
- src/lattice_textures
- src/matrixview_textures
- src/rsMath
- src/skyrocket_sounds
- src/skyrocket_textures
- files removed:
- include
- oglc_src
- oglc_src/colorfire_textures
- oglc_src/driver.cpp
- oglc_src/hufo_tunnel_textures
- other_src
- other_src/driver++.cpp
- other_src/driver.c
- other_src/matrixview_textures
- reallyslick
- reallyslick/Implicit
- reallyslick/c_src
- reallyslick/c_src/driver.c
- reallyslick/c_src/euphoria_textures
- reallyslick/c_src/lattice_textures
- reallyslick/cpp_src
- reallyslick/cpp_src/driver.cpp
- reallyslick/cpp_src/helios_textures
- reallyslick/cpp_src/hyperspace_textures
- reallyslick/cpp_src/skyrocket_sounds
- reallyslick/cpp_src/skyrocket_textures
- reallyslick/include
- reallyslick/include/Implicit
- reallyslick/include/rsMath
- reallyslick/rsMath
- utils/.deps
- files modified:
- ChangeLog
added
removed
debian/desktop_files/biof.desktop
