diff --git a/0ad-cs8833.patch b/0ad-cs8833.patch deleted file mode 100644 index 76f7b54..0000000 --- a/0ad-cs8833.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: source/ps/KeyName.h -=================================================================== ---- source/ps/KeyName.h (revision 8832) -+++ source/ps/KeyName.h (revision 8833) -@@ -34,8 +34,13 @@ - MOUSE_MIDDLE = SDLK_LAST + SDL_BUTTON_MIDDLE, - MOUSE_WHEELUP = SDLK_LAST + SDL_BUTTON_WHEELUP, - MOUSE_WHEELDOWN = SDLK_LAST + SDL_BUTTON_WHEELDOWN, -+#if SDL_VERSION_ATLEAST(1, 2, 13) - MOUSE_X1 = SDLK_LAST + SDL_BUTTON_X1, - MOUSE_X2 = SDLK_LAST + SDL_BUTTON_X2, -+#else -+ MOUSE_X1 = SDLK_LAST + SDL_BUTTON_WHEELDOWN + 1, -+ MOUSE_X2 = SDLK_LAST + SDL_BUTTON_WHEELDOWN + 2, -+#endif - - // 'Keycodes' for the unified modifier keys - UNIFIED_SHIFT, -Index: source/ps/Hotkey.cpp -=================================================================== ---- source/ps/Hotkey.cpp (revision 8832) -+++ source/ps/Hotkey.cpp (revision 8833) -@@ -178,7 +178,11 @@ - break; - case SDL_MOUSEBUTTONDOWN: - case SDL_MOUSEBUTTONUP: -+#if SDL_VERSION_ATLEAST(1, 2, 13) - if ((int)ev->ev.button.button <= SDL_BUTTON_X2) -+#else -+ if ((int)ev->ev.button.button <= SDL_BUTTON_WHEELDOWN) -+#endif - { - keycode = SDLK_LAST + (int)ev->ev.button.button; - break; diff --git a/0ad.changes b/0ad.changes index 3b332e7..e3633f0 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 11 16:52:07 UTC 2011 - philip@zaynar.co.uk + +- Update to r9049 + ------------------------------------------------------------------- Mon Feb 21 00:05:53 UTC 2011 - reddwarf@opensuse.org diff --git a/0ad.dsc b/0ad.dsc index af93ef3..0f44406 100644 --- a/0ad.dsc +++ b/0ad.dsc @@ -2,11 +2,11 @@ Format: 1.0 Source: 0ad Binary: 0ad Architecture: any -Version: r08832-1 +Version: r09049-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, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python, cmake +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, libcurl3-dev Files: - d8d3379b96b0c39e61c0d460d11bf06a 4366618 0ad-r08832.tar.gz - de993e4b2fd8191252c3a65b72eba516 9203 0ad-r08832.diff.gz + d8d3379b96b0c39e61c0d460d11bf06a 4366618 0ad-r09049.tar.gz + de993e4b2fd8191252c3a65b72eba516 9203 0ad-r09049.diff.gz diff --git a/0ad.spec b/0ad.spec index c7cdc97..4075651 100644 --- a/0ad.spec +++ b/0ad.spec @@ -1,7 +1,7 @@ # norootforbuild Name: 0ad -Version: r08832 +Version: r09049 Release: 1.0 License: GNU GPL v2 or later Group: Amusements/Games/Strategy/Real Time @@ -12,6 +12,7 @@ BuildRequires: boost-devel BuildRequires: DevIL-devel BuildRequires: fam-devel BuildRequires: gcc-c++ +BuildRequires: libcurl-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libvorbis-devel diff --git a/_service b/_service index 4a7a4a3..64acfb4 100644 --- a/_service +++ b/_service @@ -3,11 +3,11 @@ http releases.wildfiregames.com - /0ad-r08832-alpha-unix-build.tar.gz + /0ad-r09049-alpha-unix-build.tar.gz - _service:download_url:0ad-r08832-alpha-unix-build.tar.gz + _service:download_url:0ad-r09049-alpha-unix-build.tar.gz sha256 - e41f53f08a3423d502ef9d8dbb77c5518bfbc1c6bd5c7312e3ba99aa9c599817 + 6ff2fc782b67261a75450f0d069ea6964556749dfd3c04b901e3aae13fd9b6ad diff --git a/_service:download_url:0ad-r08832-alpha-unix-build.tar.gz b/_service:download_url:0ad-r08832-alpha-unix-build.tar.gz deleted file mode 100644 index bf5ca93..0000000 --- a/_service:download_url:0ad-r08832-alpha-unix-build.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e41f53f08a3423d502ef9d8dbb77c5518bfbc1c6bd5c7312e3ba99aa9c599817 -size 5911327 diff --git a/debian.changelog b/debian.changelog index b9595c9..922ced2 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +0ad (r09049-1) unstable; urgency=low + + * New upstream version. + + -- Philip Taylor Fri, 11 Mar 2011 16:52:07 +0000 + 0ad (r08832-1) unstable; urgency=low * New upstream version. diff --git a/debian.control b/debian.control index 4415250..c312b43 100644 --- a/debian.control +++ b/debian.control @@ -11,7 +11,7 @@ Build-Depends: debhelper, libdevil-dev, libenet-dev, libxml2-dev, pkg-config, libboost-filesystem1.35-dev, zip, libstdc++6-4.3-dev, libsvga1, python, - cmake + cmake, libcurl3-dev Standards-Version: 3.8.0 Homepage: http://wildfiregames.com/0ad/ diff --git a/debian.series b/debian.series index a08b80d..473a0f4 100644 --- a/debian.series +++ b/debian.series @@ -1 +0,0 @@ -0ad-cs8833.patch -p0