The following commit has been merged in the master branch: commit d9a5cd114d5bd66e4f4c1cd05af90f950c6d02aa Author: Paul Wise <[EMAIL PROTECTED]> Date: Fri Jul 4 22:31:46 2008 +0800
Hack SOUNDDEFS to use /usr/lib, drop sndsrv symlink, clean all sndsrvs This also fixes the kFreeBSD FTBFS (Closes: #486113) diff --git a/debian/changelog b/debian/changelog index eec83f3..92784b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ xgalaga (2.1.1.0-3) UNRELEASED; urgency=low * Add freedesktop menu files, tweaked from Ubuntu ones (Closes: #432398) * Use the uscan magic URL in the watch file for the QA sf.net redirector * Remove the old high score file on upgrade instead of purge + * Hack SOUNDDEFS to use /usr/lib, drop sndsrv symlink, clean all sndsrvs + - This also fixes the kFreeBSD FTBFS (Closes: #486113) -- Paul Wise <[EMAIL PROTECTED]> Thu, 03 Jul 2008 00:41:47 +0800 diff --git a/debian/rules b/debian/rules index 76a333d..b6a152c 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,8 @@ build-stamp: ./configure \ --prefix=/usr/share/games/xgalaga \ --exec-prefix=/usr/games - $(MAKE) + # hack SOUNDDEFS so we don't need symlinks + $(MAKE) SOUNDDEFS=-DSOUNDSERVER=\\\"/usr/lib/games/xgalaga/$$\(SOUNDSRV\)\\\" touch build-stamp clean: @@ -19,7 +20,7 @@ clean: dh_testroot rm -f build-stamp if [ -e Makefile ]; then $(MAKE) -i distclean; fi - dh_clean xgal.sndsrv.oss config.k.bak config.sub config.guess + dh_clean xgal.sndsrv.oss xgal.sndsrv.freebsd xgal.sndsrv.linux config.k.bak config.sub config.guess binary-indep: build @@ -30,10 +31,8 @@ binary-arch: build dh_installdirs var/games usr/lib/games/xgalaga usr/games usr/share/man/man6 $(MAKE) DESTDIR=`pwd`/debian/xgalaga install # move the sound-server binary out of usr/share - mv debian/xgalaga/usr/share/games/xgalaga/xgal.sndsrv.oss \ + mv debian/xgalaga/usr/share/games/xgalaga/xgal.sndsrv.* \ debian/xgalaga/usr/lib/games/xgalaga - dh_link usr/lib/games/xgalaga/xgal.sndsrv.oss \ - usr/share/games/xgalaga/xgal.sndsrv.oss dh_install xgalaga-icon.xpm usr/share/pixmaps/ dh_install debian/xgalaga.desktop usr/share/applications dh_install debian/xgalaga-hyperspace.desktop usr/share/applications -- Packaging for Xgalaga _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits