diff --git a/0ad.changes b/0ad.changes index e9ec008..c907487 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 17 22:15:45 UTC 2010 - philip@zaynar.co.uk + +- Update to r8413 + ------------------------------------------------------------------- Sun Aug 15 15:29:40 UTC 2010 - philip@zaynar.co.uk diff --git a/0ad.dsc b/0ad.dsc index 730c93b..ae3289a 100644 --- a/0ad.dsc +++ b/0ad.dsc @@ -2,11 +2,11 @@ Format: 1.0 Source: 0ad Binary: 0ad Architecture: any -Version: r07970-1 +Version: r08413-1 Maintainer: Stephan Kleine Homepage: http://wildfiregames.com/0ad/ Standards-Version: 3.8.0 -Build-Depends: debhelper, libsdl1.2-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, libgamin-dev, nasm, libwxgtk2.8-dev, libboost1.35-dev, libboost-signals1.35-dev, libopenal-dev, libalut-dev, libvorbis-dev, libogg-dev, binutils-dev, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python +Build-Depends: debhelper, libsdl1.2-dev, zlib1g-dev, libpng12-dev, libjpeg62-dev, libgamin-dev, nasm, libwxgtk2.8-dev, libboost1.35-dev, libboost-signals1.35-dev, libopenal-dev, libalut-dev, libvorbis-dev, libogg-dev, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python, cmake Files: - d8d3379b96b0c39e61c0d460d11bf06a 4366618 0ad-r07970.tar.gz - de993e4b2fd8191252c3a65b72eba516 9203 0ad-r07970.diff.gz + d8d3379b96b0c39e61c0d460d11bf06a 4366618 0ad-r08413.tar.gz + de993e4b2fd8191252c3a65b72eba516 9203 0ad-r08413.diff.gz diff --git a/0ad.spec b/0ad.spec index 3e7a780..dd808b1 100644 --- a/0ad.spec +++ b/0ad.spec @@ -1,14 +1,13 @@ # norootforbuild Name: 0ad -Version: r07970 +Version: r08413 Release: 1.0 License: GNU GPL v2 or later Group: Amusements/Games/Strategy/Real Time Url: http://wildfiregames.com/0ad/ Source: 0ad-%{version}-alpha-unix-build.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: binutils-devel BuildRequires: boost-devel BuildRequires: DevIL-devel BuildRequires: fam-devel @@ -21,6 +20,7 @@ BuildRequires: nasm BuildRequires: python BuildRequires: subversion BuildRequires: zip +BuildRequires: cmake %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -44,11 +44,6 @@ BuildRequires: openal-soft-devel BuildRequires: pkgconfig BuildRequires: SDL-devel BuildRequires: wxGTK-devel - -%if 0%{?fedora_version} == 13 -BuildRequires: binutils-static -%endif - %endif %if 0%{?mandriva_version} @@ -107,6 +102,10 @@ LD_LIBRARY_PATH=binaries/system binaries/system/test -libdir binaries/system %__install -Dm 0755 binaries/system/libCollada.so %{buildroot}%{_libdir}/%{name}/libCollada.so %__install -Dm 0755 binaries/system/libAtlasUI.so %{buildroot}%{_libdir}/%{name}/libAtlasUI.so %__install -Dm 0755 binaries/system/libmozjs-ps-release.so %{buildroot}%{_libdir}/%{name}/libmozjs-ps-release.so +%__install -Dm 0755 binaries/system/libnvcore.so %{buildroot}%{_libdir}/%{name}/libnvcore.so +%__install -Dm 0755 binaries/system/libnvimage.so %{buildroot}%{_libdir}/%{name}/libnvimage.so +%__install -Dm 0755 binaries/system/libnvmath.so %{buildroot}%{_libdir}/%{name}/libnvmath.so +%__install -Dm 0755 binaries/system/libnvtt.so %{buildroot}%{_libdir}/%{name}/libnvtt.so #__install -Dm 0755 binaries/system/ActorEditor %{buildroot}/%{_libexecdir}/%{name}/bin/ActorEditor #__install -Dm 0755 binaries/system/ColourTester %{buildroot}/%{_libexecdir}/%{name}/bin/ColourTester @@ -138,6 +137,10 @@ test "%{buildroot}" != "/" && %__rm -rf %{buildroot} %{_libdir}/%{name}/libCollada.so %{_libdir}/%{name}/libAtlasUI.so %{_libdir}/%{name}/libmozjs-ps-release.so +%{_libdir}/%{name}/libnvcore.so +%{_libdir}/%{name}/libnvimage.so +%{_libdir}/%{name}/libnvmath.so +%{_libdir}/%{name}/libnvtt.so %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/%{name}.desktop %dir %{_libdir}/%{name} diff --git a/_service b/_service index 234e3e0..c59eac3 100644 --- a/_service +++ b/_service @@ -3,11 +3,11 @@ http releases.wildfiregames.com - /0ad-r07970-alpha-unix-build.tar.gz + /0ad-r08413-alpha-unix-build.tar.gz - _service:download_url:0ad-r07970-alpha-unix-build.tar.gz + _service:download_url:0ad-r08413-alpha-unix-build.tar.gz sha256 - 02f205725ed3d9a9d5f353e4f478b9b305f987253f7db13e76fe30c6ea4d5d5b + a57ee161f5917c0845cc416c2a2b8bcc457a05b7a1a5cbfdbe32dd71debcd3df diff --git a/debian.changelog b/debian.changelog index 2584bcc..f38c1ce 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +0ad (r08413-1) unstable; urgency=low + + * New upstream version. + + -- Philip Taylor Sun, 17 Oct 2010 23:15:45 +0100 + 0ad (r07970-1) unstable; urgency=low * New upstream version. diff --git a/debian.control b/debian.control index 5adceb0..4415250 100644 --- a/debian.control +++ b/debian.control @@ -8,10 +8,10 @@ Build-Depends: debhelper, libwxgtk2.8-dev, libboost1.35-dev, libboost-signals1.35-dev, libopenal-dev, libalut-dev, libvorbis-dev, libogg-dev, - binutils-dev, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, - zip, libstdc++6-4.3-dev, libsvga1, python + zip, libstdc++6-4.3-dev, libsvga1, python, + cmake Standards-Version: 3.8.0 Homepage: http://wildfiregames.com/0ad/ diff --git a/debian.install b/debian.install index ca3c998..74d60a3 100644 --- a/debian.install +++ b/debian.install @@ -3,5 +3,9 @@ usr/games/pyrogenesis usr/lib/games/0ad/libAtlasUI.so usr/lib/games/0ad/libCollada.so usr/lib/games/0ad/libmozjs-ps-release.so +usr/lib/games/0ad/libnvcore.so +usr/lib/games/0ad/libnvimage.so +usr/lib/games/0ad/libnvmath.so +usr/lib/games/0ad/libnvtt.so usr/share/pixmaps/0ad.png usr/share/applications/0ad.desktop diff --git a/debian.rules b/debian.rules index 9524b78..2f7e269 100644 --- a/debian.rules +++ b/debian.rules @@ -61,6 +61,10 @@ install: build install -Dm 0755 binaries/system/libCollada.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libCollada.so install -Dm 0755 binaries/system/libAtlasUI.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libAtlasUI.so install -Dm 0755 binaries/system/libmozjs-ps-release.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libmozjs-ps-release.so + install -Dm 0755 binaries/system/libnvcore.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvcore.so + install -Dm 0755 binaries/system/libnvimage.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvimage.so + install -Dm 0755 binaries/system/libnvmath.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvmath.so + install -Dm 0755 binaries/system/libnvtt.so $(CURDIR)/debian/tmp/usr/lib/games/0ad/libnvtt.so sed -i 's/\/usr\/bin/\/usr\/games/' build/resources/0ad.sh sed -i 's/\/usr\/bin/\/usr\/games/' build/resources/0ad.desktop