diff -Nru openarena-085-data-0.8.5split/debian/changelog openarena-085-data-0.8.5split/debian/changelog --- openarena-085-data-0.8.5split/debian/changelog 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/changelog 2014-08-18 11:38:43.000000000 +0000 @@ -1,3 +1,13 @@ +openarena-085-data (0.8.5split-3) unstable; urgency=low + + * Merge from openarena-data 0.8.5split-3: + - Update common files for 0.8.8 + - Support build-arch, build-indep + - Standards-Version: 3.9.5 (no changes) + - Bump debhelper compat level to 9 to avoid deprecated dh_pysupport + + -- Simon McVittie Mon, 18 Aug 2014 12:35:50 +0100 + openarena-085-data (0.8.5split-2) unstable; urgency=low * Merge from openarena-data 0.8.5split-2: diff -Nru openarena-085-data-0.8.5split/debian/compat openarena-085-data-0.8.5split/debian/compat --- openarena-085-data-0.8.5split/debian/compat 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/compat 2014-08-18 11:38:43.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru openarena-085-data-0.8.5split/debian/control openarena-085-data-0.8.5split/debian/control --- openarena-085-data-0.8.5split/debian/control 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/control 2014-08-18 11:38:43.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Debian Games Team Uploaders: Bruno "Fuddl" Kleinert , Simon McVittie -Build-Depends: debhelper (>= 8) +Build-Depends: debhelper (>= 9) Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.5 Homepage: http://www.openarena.ws/ Vcs-Git: git://anonscm.debian.org/pkg-games/openarena-data.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/openarena-data.git;h=openarena-085-data diff -Nru openarena-085-data-0.8.5split/debian/copyright openarena-085-data-0.8.5split/debian/copyright --- openarena-085-data-0.8.5split/debian/copyright 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/copyright 2014-08-18 11:38:43.000000000 +0000 @@ -1,13 +1,14 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: OpenArena Upstream-Contact: http://openarena.ws/ Source: http://openarena.ws/download.php?view.2 (oa081.zip) http://openarena.ws/download.php?view.3 (oa085p.zip) + http://openarena.ws/download.php?view.5 (oa088p.zip) http://openarena.ws/svn/source/assets/ (source files) . - The "orig" tarball is derived from oa081.zip and oa085p.zip, with the - engine, non-free files etc. removed, the PK3 files unpacked, and + The "orig" tarballs are derived from oa081.zip, oa085p.zip and oa088p.zip, + with the engine, non-free files etc. removed, the PK3 files unpacked, and source files added (where the files from the PK3 are not themselves the preferred form for modification). See README.source for full details. @@ -30,9 +31,15 @@ You can find the GPL license text on a Debian system under /usr/share/common-licenses/GPL-2. +License: even-shorter-GPL-2 + "License: GPLv2" + . + You can find the GPL license text on a Debian system under + /usr/share/common-licenses/GPL-2. + Files: * Copyright: - © 2005-2008 OpenArena Team (see CREDITS or CREDITS-0.8.5) + © 2005-2012 OpenArena Team (see CREDITS, CREDITS-0.8.5, CREDITS-0.8.8) © 1997-2006 id Software, Inc. © Seth and Ulrich Galbraith (no year specified) © 2003 Robert P. Gove Jr. (R.P.G.) @@ -44,12 +51,19 @@ © 2006-2008 Chris Holden © 2007-2008 Blake John Heatly © 2008 Fuzztooth (mancubus.net) + © 2010 Poul Sander (Sago007) + © 2010 Zimmermann Gyula + © 2010 Jens Loehr License: GPL-2+ -Files: models/players/merman, source/assets/models/merman +Files: */models/players/merman source/assets/models/merman Copyright: © 2007 Enki License: short-GPL-2 +Files: source/assets/maps/oa_thor.* pak6-patch088/maps/oa_thor.* +Copyright: © "Thor" (no year specified) +License: even-shorter-GPL-2 + Files: debian/* Copyright: © 2010 Bruno Kleinert diff -Nru openarena-085-data-0.8.5split/debian/gbp.conf openarena-085-data-0.8.5split/debian/gbp.conf --- openarena-085-data-0.8.5split/debian/gbp.conf 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/gbp.conf 2014-08-18 11:38:43.000000000 +0000 @@ -4,5 +4,6 @@ upstream-branch = there-is-no-upstream-branch overlay = True export-dir = ../build-area -tarball-dir = .. +tarball-dir = ../tarballs compression = bzip2 +debian-tag = debian/openarena-085-data/%(version)s diff -Nru openarena-085-data-0.8.5split/debian/openarena-088-data.docs openarena-085-data-0.8.5split/debian/openarena-088-data.docs --- openarena-085-data-0.8.5split/debian/openarena-088-data.docs 1970-01-01 00:00:00.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/openarena-088-data.docs 2014-08-18 11:38:43.000000000 +0000 @@ -0,0 +1 @@ +CREDITS-0.8.8 diff -Nru openarena-085-data-0.8.5split/debian/openarena-088-data.install openarena-085-data-0.8.5split/debian/openarena-088-data.install --- openarena-085-data-0.8.5split/debian/openarena-088-data.install 1970-01-01 00:00:00.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/openarena-088-data.install 2014-08-18 11:38:43.000000000 +0000 @@ -0,0 +1,2 @@ +pak6-patch088.pk3 usr/share/games/openarena/baseoa +readme_088.txt usr/share/doc/openarena-088-data diff -Nru openarena-085-data-0.8.5split/debian/openarena-088-data.links openarena-085-data-0.8.5split/debian/openarena-088-data.links --- openarena-085-data-0.8.5split/debian/openarena-088-data.links 1970-01-01 00:00:00.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/openarena-088-data.links 2014-08-18 11:38:43.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/doc/openarena-088-data/readme_088.txt usr/share/doc/openarena-088-data/README +usr/share/doc/openarena-088-data/CREDITS-0.8.8 usr/share/doc/openarena-088-data/CREDITS diff -Nru openarena-085-data-0.8.5split/debian/openarena-088-data.paks openarena-085-data-0.8.5split/debian/openarena-088-data.paks --- openarena-085-data-0.8.5split/debian/openarena-088-data.paks 1970-01-01 00:00:00.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/openarena-088-data.paks 2014-08-18 11:38:43.000000000 +0000 @@ -0,0 +1 @@ +pak6-patch088 Binary files /tmp/6kbemFyvW8/openarena-085-data-0.8.5split/debian/pak6-patch088-4c6fe463.qvm and /tmp/VRfBWn0x6T/openarena-085-data-0.8.5split/debian/pak6-patch088-4c6fe463.qvm differ Binary files /tmp/6kbemFyvW8/openarena-085-data-0.8.5split/debian/pak6-patch088-bb90ea00.qvm and /tmp/VRfBWn0x6T/openarena-085-data-0.8.5split/debian/pak6-patch088-bb90ea00.qvm differ Binary files /tmp/6kbemFyvW8/openarena-085-data-0.8.5split/debian/pak6-patch088-e27f432e.qvm and /tmp/VRfBWn0x6T/openarena-085-data-0.8.5split/debian/pak6-patch088-e27f432e.qvm differ diff -Nru openarena-085-data-0.8.5split/debian/pak6-patch088.pk3.contents openarena-085-data-0.8.5split/debian/pak6-patch088.pk3.contents --- openarena-085-data-0.8.5split/debian/pak6-patch088.pk3.contents 1970-01-01 00:00:00.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/pak6-patch088.pk3.contents 2014-08-18 11:38:43.000000000 +0000 @@ -0,0 +1,716 @@ +# Produced by list-pk3.pl from pak6-patch088.pk3 +# This file is machine-readable, CRC32 \t filename; to list files, +# use: sed -n -e 's/#.*//; s/.*\t//p;' +# To be compatible, you will need the following files and +# checksums (hex) in this order: +directory botfiles/ +98e318f4 botfiles/fw_items.c +3b5821f7 botfiles/fw_weap.c +7e9742ce COPYING +directory demos/ +bab4defd demos/demo088-test1.dm_71 +directory gfx/ +directory gfx/2d/ +55672c13 gfx/2d/bigchars.tga +8e0a7c71 gfx/2d/flared.tga +directory gfx/fx/ +directory gfx/fx/decals/ +882b4e1f gfx/fx/decals/bulletgeneric.tga +73cd76e3 gfx/fx/decals/bulletmetal.tga +359aa1a4 gfx/fx/decals/markatlas.tga +directory gfx/fx/detail/ +5128adb7 gfx/fx/detail/d_conc.tga +10e38ee3 gfx/fx/detail/d_conc2.tga +f752973c gfx/fx/detail/d_ice.tga +f7edba2f gfx/fx/detail/d_mdrock.tga +7ad86a03 gfx/fx/detail/d_met.tga +722bce7c gfx/fx/detail/d_met2.tga +7fa4114d gfx/fx/detail/d_pebble.tga +e443ffeb gfx/fx/detail/d_rock.tga +7381bb2e gfx/fx/detail/d_sand.tga +519d8ff8 gfx/fx/detail/d_sandy.tga +98bd88e7 gfx/fx/detail/d_scale.tga +ea226037 gfx/fx/detail/d_stone.tga +bad0376d gfx/fx/detail/d_wood.tga +directory gfx/fx/flares/ +d717d925 gfx/fx/flares/blur.tga +f145f66a gfx/fx/flares/largeglow.tga +0391eb28 gfx/fx/flares/lava.tga +9ff684b9 gfx/fx/flares/portalflare.tga +1594adea gfx/fx/flares/rays.tga +2655d821 gfx/fx/flares/standard.tga +91752a56 gfx/fx/flares/twilight.tga +d95a99cb gfx/fx/flares/wide.tga +directory gfx/fx/spec/ +f3623273 gfx/fx/spec/gunmetal.tga +2941f725 gfx/fx/spec/hairspec.tga +6e086d41 gfx/fx/spec/jewelry.tga +6e086d41 gfx/fx/spec/robawt.tga +65f6fdfe gfx/fx/spec/skin.tga +65f6fdfe gfx/fx/spec/specenv.tga +1f6ed2e3 gfx/fx/spec/spots.tga +directory gfx/fx/water/ +a6e3816d gfx/fx/water/waves.tga +directory glsl/ +cf7c40d5 glsl/Brightness_fp.glsl +63905d69 glsl/Brightness_vp.glsl +62cc7f80 glsl/BWfilter_fp.glsl +63905d69 glsl/BWfilter_vp.glsl +147417d8 glsl/edges_fp.glsl +39e3dc40 glsl/edges_vp.glsl +fee7017c glsl/EGAfilter_fp.glsl +63905d69 glsl/EGAfilter_vp.glsl +fabd1e1c glsl/generic_fp.glsl +da98bc92 glsl/generic_vp.glsl +23551134 glsl/lightmappedMultitexture_fp.glsl +52e56ab0 glsl/lightmappedMultitexture_vp.glsl +962fb221 glsl/pass_vp.glsl +0a2b7d0e glsl/Reflect_fp.glsl +63905d69 glsl/Reflect_vp.glsl +37f43547 glsl/sky_fp.glsl +8b625924 glsl/sky_vp.glsl +e39b375c glsl/texturing.glsl +23551134 glsl/vertexLitTexture_fp.glsl +52e56ab0 glsl/vertexLitTexture_vp.glsl +directory icons/ +7a694134 icons/iconf_neutral1.tga +25712be4 icons/iconf_neutral2.tga +77904482 icons/iconf_neutral3.tga +e6dea43c icons/iconh_borb.tga +7c786186 icons/iconh_rorb.tga +e6dea43c icons/skull_blue.tga +7c786186 icons/skull_red.tga +directory levelshots/ +f351bf4e levelshots/aggressor.tga +4efba6e3 levelshots/am_galmevish2.tga +625241ec levelshots/am_lavaarena.tga +920f7209 levelshots/am_lavactf.tga +1c71ec8c levelshots/am_lavactfxl.tga +2801a9dd levelshots/am_mckinleyish2.tga +2d6919f8 levelshots/am_spacecont.tga +46273acc levelshots/am_thornish.tga +9f904a66 levelshots/am_underworks2.tga +fa19f062 levelshots/cbctf1.tga +83ee5c95 levelshots/czest1dm.tga +856ee53f levelshots/czest2ctf.tga +52ff35f3 levelshots/czest3ctf.tga +f97d1a74 levelshots/delta.tga +e37439c8 levelshots/islandctf.tga +b3e66906 levelshots/mlca1.tga +a347d156 levelshots/mlctf1beta.tga +95bdecac levelshots/oasago1.tga +38cea1ab levelshots/oasago1f1.tga +bc9e3d68 levelshots/oasago2.tga +3e32704b levelshots/oa_bases3.tga +4492b928 levelshots/oa_bases3cl.tga +d8013540 levelshots/oa_bases3p3ta.tga +10fab62e levelshots/oa_bases3plus3.tga +911778ad levelshots/oa_bases7.tga +45972c9f levelshots/oa_ctf2.tga +60a80316 levelshots/oa_ctf2old.tga +be9917a8 levelshots/oa_ctf4ish.tga +be9c0398 levelshots/oa_koth1.tga +ee92f0f0 levelshots/oa_koth2.tga +d45335b8 levelshots/oa_minia.tga +f318f655 levelshots/oa_shouse.tga +1d094bb6 levelshots/oa_spirit3.tga +70bf3a8d levelshots/oa_thor.tga +8e8ada4e levelshots/ps37ctf2.tga +7a2cde7e levelshots/ps9ctf.tga +44b54612 levelshots/pul1ctf.tga +2d1ecaf5 levelshots/pul1duel-oa.tga +d1574424 levelshots/pxlfan.tga +5ad4c092 levelshots/sleekgrinder.tga +directory maps/ +e94309fc maps/aggressor.aas +90b0638f maps/aggressor.bsp +bfb8c697 maps/am_galmevish2.aas +36257e8e maps/am_galmevish2.bsp +667d65c4 maps/am_lavaarena.aas +e079df1a maps/am_lavaarena.bsp +7829efb0 maps/am_lavactf.aas +c9f08350 maps/am_lavactf.bsp +6a74cccd maps/am_lavactfxl.aas +8471418b maps/am_lavactfxl.bsp +64b04ae4 maps/am_mckinleyish2.aas +2f9f082f maps/am_mckinleyish2.bsp +aa0daeea maps/am_spacecont.aas +0100fe02 maps/am_spacecont.bsp +705dd44f maps/am_thornish.aas +652183ed maps/am_thornish.bsp +57ce7292 maps/am_underworks2.aas +d7412320 maps/am_underworks2.bsp +8d87717e maps/cbctf1.aas +11bb0b2a maps/cbctf1.bsp +62802a07 maps/czest1dm.aas +b04cbc15 maps/czest1dm.bsp +240a186b maps/czest2ctf.aas +871c96ed maps/czest2ctf.bsp +af81b560 maps/czest3ctf.aas +1917894e maps/czest3ctf.bsp +8e1fc461 maps/delta.aas +e27808cb maps/delta.bsp +30168961 maps/mlca1.aas +64344ce2 maps/mlca1.bsp +3db38759 maps/mlctf1beta.aas +c6b0f8b5 maps/mlctf1beta.bsp +086a3d11 maps/oasago1.aas +ab493835 maps/oasago1.bsp +2a1e7e71 maps/oasago2.aas +e433c0fa maps/oasago2.bsp +7ae60def maps/oa_bases3.aas +31bcfba8 maps/oa_bases3.bsp +cbe3f617 maps/oa_bases3p3ta.aas +e6dd0e2f maps/oa_bases3p3ta.bsp +5e56ea42 maps/oa_bases3plus3.aas +06c75917 maps/oa_bases3plus3.bsp +b361398f maps/oa_bases7.aas +f3b60ec7 maps/oa_bases7.bsp +57ce5921 maps/oa_ctf2.aas +9448f34c maps/oa_ctf2.bsp +fa6befcd maps/oa_ctf2old.aas +52ace211 maps/oa_ctf2old.bsp +9e3d00f7 maps/oa_ctf4ish.aas +c22efe9f maps/oa_ctf4ish.bsp +1832c24f maps/oa_koth1.aas +5fc75f80 maps/oa_koth1.bsp +b62e2eb3 maps/oa_koth2.aas +9ed3f3ae maps/oa_koth2.bsp +ba2b3374 maps/oa_minia.aas +0c5fd20a maps/oa_minia.bsp +4a5683a8 maps/oa_shouse.aas +5a4b14ad maps/oa_shouse.bsp +b3f29d3e maps/oa_spirit3.aas +df3eeb6f maps/oa_spirit3.bsp +23543791 maps/oa_thor.aas +b9febb34 maps/oa_thor.bsp +93db4392 maps/ps37ctf2.aas +16f15a17 maps/ps37ctf2.bsp +1f333ef4 maps/ps9ctf.aas +18cce461 maps/ps9ctf.bsp +d159f00d maps/pul1ctf.aas +78f98da1 maps/pul1ctf.bsp +a1e54009 maps/pul1duel-oa.aas +6ef4a5fd maps/pul1duel-oa.bsp +eff2feb6 maps/pxlfan.aas +2fe6b67e maps/pxlfan.bsp +9990454b maps/sleekgrinder.aas +6bdad343 maps/sleekgrinder.bsp +e62587a3 maps/slimefac.aas +9d4911c0 maps/slimefac.bsp +13145ecf maps_ctf.cfg.org +a263f01a maps_dd.cfg.org +377d3fab maps_dm.cfg.org +9f771ca6 maps_dom.cfg.org +c88c8b70 maps_elimination.cfg.org +bd25e53d maps_harvester.cfg.org +377d3fab maps_lms.cfg.org +c04316f6 maps_obelisk.cfg.org +f4356683 maps_oneflag.cfg.org +4b46bfbc maps_tdm.cfg.org +8e97f2f8 maps_tourney.cfg.org +5d75c062 mlca1_readme.txt +directory models/ +directory models/ammo/ +directory models/ammo/hook/ +ad876d1d models/ammo/hook/hook.md3 +directory models/desertfactory/ +directory models/desertfactory/structure_metal/ +6741c1a6 models/desertfactory/structure_metal/cables01.ase +d83c2587 models/desertfactory/structure_metal/ladder02.ase +directory models/map/ +directory models/mapobjects/ +directory models/mapobjects/cosmoflash/ +d802a4e8 models/mapobjects/cosmoflash/tele4_frame.tga +e697ccb6 models/mapobjects/cosmoflash/tele4_portal.tga +a2ad6131 models/mapobjects/cosmoflash/teleporter4_frame.md3 +435a4719 models/mapobjects/cosmoflash/teleporter4_portal.md3 +directory models/mapobjects/fan/ +23cdb91f models/mapobjects/fan/fan.tga +directory models/mapobjects/flagbase/ +7a09c593 models/mapobjects/flagbase/blue_base.md3 +71f69762 models/mapobjects/flagbase/ntrl_base.md3 +aaf65521 models/mapobjects/flagbase/red_base.md3 +directory models/mapobjects/hdr2/ +7c66e4b3 models/mapobjects/hdr2/hdrnx_box1.ase +directory models/mapobjects/redish/ +5cb027d4 models/mapobjects/redish/lightspot_white.ase +directory models/mapobjects/torch/ +be19748d models/mapobjects/torch/torchnew.md3 +592133ce models/mapobjects/torch/torchnew.tga +directory models/mapobjects/underwrks/ +0d3d9358 models/mapobjects/underwrks/uw_bigcartel.ase +bf455168 models/mapobjects/underwrks/uw_lightspot.ase +3c85cb3a models/mapobjects/underwrks/uw_lightspot_short.ase +401a8b42 models/map/forklift.jpg +d3940972 models/map/forklift.md3 +directory models/players/ +directory models/players/angelyss/ +cf03a444 models/players/angelyss/animation.cfg +ca5303bf models/players/angelyss/lower.md3 +1600f606 models/players/angelyss/lower_1.md3 +9e71a5cb models/players/angelyss/lower_2.md3 +directory models/players/beret/ +4a18ab63 models/players/beret/iconh_cooldude.tga +directory models/players/gargoyle/ +e8d7d8e9 models/players/gargoyle/animation.cfg +ae5bc9d0 models/players/gargoyle/head.md3 +cffd8083 models/players/gargoyle/head_1.md3 +a2b6be97 models/players/gargoyle/head_2.md3 +76d7def9 models/players/gargoyle/iconh_obs.tga +3d27ebd6 models/players/gargoyle/lower.md3 +ab3a8804 models/players/gargoyle/lower_1.md3 +d983a526 models/players/gargoyle/lower_2.md3 +d499e013 models/players/gargoyle/specwing.jpg +1e0f56d9 models/players/gargoyle/upper.md3 +c54c1278 models/players/gargoyle/upper_1.md3 +68ccc72e models/players/gargoyle/upper_2.md3 +directory models/players/hnt/ +14a320f2 models/players/hnt/hairspecmask.tga +directory models/players/kyonshi/ +b8ffab9b models/players/kyonshi/iconh_beh.tga +directory models/players/liz/ +fa82cf5c models/players/liz/animation.cfg +8733b9fa models/players/liz/lower.md3 +directory models/players/major/ +a2d76a32 models/players/major/iconh_leth.tga +directory models/players/neko/ +d30ef8bc models/players/neko/animation.cfg +9773f6f6 models/players/neko/botm_bl.tga +f08e15a8 models/players/neko/botm_rd.tga +c73afa58 models/players/neko/hair.tga +eb9fab0a models/players/neko/hair_bl.tga +7f89e442 models/players/neko/hair_rd.tga +02aecffc models/players/neko/hair_spec.tga +95278492 models/players/neko/head.md3 +42e6e341 models/players/neko/head_blue.skin +39088f3b models/players/neko/head_default.skin +96e7ff12 models/players/neko/head_old.skin +319440ae models/players/neko/head_red.skin +2a6b18a4 models/players/neko/iconh_old.tga +a7dced38 models/players/neko/icon_blue.tga +9f0b496a models/players/neko/icon_default.tga +e5358b28 models/players/neko/icon_red.tga +cb83e616 models/players/neko/lower.md3 +6fde3407 models/players/neko/lower_blue.skin +090f8d43 models/players/neko/lower_default.skin +e8027b39 models/players/neko/lower_old.skin +c84112e2 models/players/neko/lower_red.skin +59131f7e models/players/neko/neko.tga +24596f63 models/players/neko/NekoHairspec.tga +94f8cfc4 models/players/neko/neko_blue.tga +4be2ca03 models/players/neko/neko_old.tga +8cd64ea4 models/players/neko/neko_red.tga +e213ab39 models/players/neko/upper.md3 +40abf81f models/players/neko/upper_blue.skin +40abf81f models/players/neko/upper_default.skin +40abf81f models/players/neko/upper_old.skin +40abf81f models/players/neko/upper_red.skin +directory models/powerups/ +directory models/powerups/holdable/ +2cea9d77 models/powerups/holdable/invulnerability.md3 +directory models/powerups/shield/ +4d2a35d8 models/powerups/shield/impact.md3 +5faf6c9b models/powerups/shield/impact.tga +492cd545 models/powerups/shield/juiced-drip.tga +ede4dfe9 models/powerups/shield/juiced-splat.tga +b1bae4cf models/powerups/shield/juicer.md3 +d5410cc8 models/powerups/shield/shield.md3 +05ade1a9 models/powerups/shield/shieldfx.tga +506a3cef models/powerups/shield/shieldwire.tga +directory models/weapons2/ +directory models/weapons2/bfg/ +858c7f81 models/weapons2/bfg/bfg.md3 +0eeee6fb models/weapons2/bfg/bfg_barrel.md3 +directory models/weapons2/grapple/ +108a3476 models/weapons2/grapple/grapple.md3 +ad876d1d models/weapons2/grapple/grapple_barrel.md3 +b6598346 models/weapons2/grapple/hook.tga +492f42ef models/weapons2/grapple/hookbeam.tga +9cad8099 models/weapons2/grapple/hookgun.tga +b0ad0721 models/weapons2/grapple/hookspec.tga +directory models/weapons2/machinegun/ +5f01a38f models/weapons2/machinegun/f_machinegun.jpg +1dbfe2f1 models/weapons2/machinegun/f_machinegun3.jpg +directory music/ +d66eef75 music/OA01.ogg +dff5b2cb music/OA02.ogg +7091bfbb music/OA06.ogg +d6494857 music/OA07.ogg +00c298df music/OA08.ogg +3f0f880e music/OA13.ogg +e046b9ad music/OA14.ogg +822e1e8e pul1duel-oa-readme.txt +directory scripts/ +8a2e085e scripts/085p.arena +edc1124f scripts/am_base_wall2.shader +9db9180f scripts/am_cf_models.shader +bcca1bd0 scripts/am_cosmoflash.shader +131bb2a0 scripts/am_proto2.shader +11be4ba6 scripts/arenas.txt +4038c159 scripts/bots.txt +c74ba5d1 scripts/clown.shader +0c884509 scripts/cosmoflash.shader +ccbbcefc scripts/desertfactory.shader +d591f613 scripts/detailtest.shader +5fcf04b3 scripts/evil8_base.shader +faead20d scripts/evil8_lights-missing.shader +451cd8ef scripts/hotmenu.shader +1926e566 scripts/iconsprites.shader +26b4d280 scripts/leifx.shader +4ed0a7be scripts/liquid_lavas.shader +823ddf13 scripts/liquid_water.shader +85942b55 scripts/newmenu.shader +052bd050 scripts/oaflares.shader +87d0f7ba scripts/oanew.shader +582e5af6 scripts/oasfx-oasago2.shader +8462cd91 scripts/oa_ctf.shader +4e172d7d scripts/oa_fogs.shader +211d8209 scripts/oa_mapobjects.shader +0f340adf scripts/oa_powerups2.shader +0264296b scripts/oa_pro_players.shader +0217f57a scripts/player_angelyss.shader +5dd82097 scripts/player_arachna.shader +d1550c54 scripts/player_assassin.shader +de9ced64 scripts/player_ayumi.shader +01c31756 scripts/player_beret.shader +b384a7c6 scripts/player_gargoyle.shader +44a5b0cc scripts/player_liz.shader +0d017e6a scripts/player_major.shader +211df58a scripts/player_neko.shader +3568b30b scripts/player_penguin.shader +09f643bb scripts/player_sergei.shader +f240f431 scripts/player_skelebot.shader +478b203f scripts/player_smarine.shader +05448beb scripts/player_sorceress.shader +459619ef scripts/player_tony.shader +650fd90b scripts/pul1duel-missing.shader +fc2e5363 scripts/pul1duel-new.shader +4c588b80 scripts/pxlfan.shader +8cd097bf scripts/sfx.shader +10842496 scripts/shells.shader +a7184c8b scripts/teleporter.shader +44cf9a8b scripts/weaponhits.shader +6b6aed0d scripts/weaponry.shader +70fd3972 scripts/weapon_bfg.shader +8843e365 scripts/weapon_chaingun.shader +ef87d1c1 scripts/weapon_gauntlet.shader +1cdf4f23 scripts/weapon_grapple.shader +d86f0b32 scripts/weapon_grenadelauncher.shader +7658dbef scripts/weapon_machinegun.shader +a4177f17 scripts/weapon_muzzles.shader +a58122c7 scripts/weapon_newmuzzle.shader +f67ea6f1 scripts/weapon_plasma.shader +a4656082 scripts/weapon_railgun.shader +ab23bbe7 scripts/weapon_rocketlauncher.shader +ca3c7027 scripts/weapon_shotgun.shader +4b503515 slimefac.txt +directory sound/ +directory sound/items/ +1da25819 sound/items/invul_activate.wav +435dc13a sound/items/invul_impact_01.wav +d83533ce sound/items/invul_impact_02.wav +fc005f52 sound/items/invul_impact_03.wav +1bde3763 sound/items/invul_juiced.wav +directory sound/le/ +ab51520b sound/le/bullet1.wav +e7180a91 sound/le/bullet2.wav +ed6b9cd2 sound/le/bullet3.wav +43f945e7 sound/le/shell1.wav +8f02929e sound/le/shell2.wav +1df46673 sound/le/shell3.wav +0ca5ccb7 sound/le/splat1.wav +90755f92 sound/le/splat2.wav +873f7b56 sound/le/splat3.wav +885d50c6 sound/le/splat4.wav +46879a25 sound/le/splat5.wav +directory sound/movers/ +directory sound/movers/plats/ +cd4704f7 sound/movers/plats/pt1_end.wav +a9cc7d11 sound/movers/plats/pt1_strt.wav +directory sound/movers/switches/ +5a1b2b3a sound/movers/switches/butn2.wav +directory sound/player/ +directory sound/player/neko/ +aadbd38a sound/player/neko/credit +202a8d23 sound/player/neko/death1.ogg +8c367033 sound/player/neko/death2.ogg +a3a22983 sound/player/neko/death3.ogg +b2dac605 sound/player/neko/drown.ogg +1143f578 sound/player/neko/fall1.ogg +e4ef9500 sound/player/neko/falling1.ogg +f6ed514b sound/player/neko/gasp.ogg +90814d4e sound/player/neko/jump1.ogg +a7f8ce3d sound/player/neko/pain100_1.ogg +5cb36fa4 sound/player/neko/pain25_1.ogg +2b96dc02 sound/player/neko/pain50_1.ogg +83781c20 sound/player/neko/pain75_1.ogg +f4a6c963 sound/player/neko/taunt.ogg +directory sound/pulchr/ +9f20baae sound/pulchr/forcewalk.wav +directory sound/weapons/ +directory sound/weapons/grapple/ +8f072925 sound/weapons/grapple/grapfire.wav +cc1aea9c sound/weapons/grapple/graphit.wav +c70e4b63 sound/weapons/grapple/grappull.wav +directory sound/weapons/rocket/ +directory sprites/ +directory sprites/le/ +ee1e2dc3 sprites/le/blast.tga +1d6b1ffb sprites/le/blood.tga +19896cea sprites/le/blood2.tga +f071f44e sprites/le/blood3.tga +619a365c sprites/le/glaw.tga +50ec8c39 sprites/le/ptrail.tga +4fbca697 sprites/le/smoke1.tga +39db5c74 sprites/le/smoke2.tga +ec856bb0 sprites/le/smoke3.tga +24345781 sprites/le/smoke4.tga +25ccda2d sprites/le/smoke5.tga +5d6648c1 sprites/le/spark.tga +56dff76a sprites/le/spark2.tga +cbbb5dd0 sprites/le/splash.tga +directory textures/ +directory textures/acc_dm3/ +42f5305d textures/acc_dm3/concrttrim_blue.jpg +cd1df3db textures/acc_dm3/wallbot_blue.jpg +directory textures/base_floor/ +fded68b3 textures/base_floor/clang_floor_ow2.jpg +directory textures/base_light/ +860d3c62 textures/base_light/border7_ceil50.jpg +c77cdee3 textures/base_light/border7_ceil50glow.jpg +0fa6496f textures/base_light/scrolllight.jpg +9c3a50bf textures/base_light/scrolllight2.jpg +5f6975a5 textures/base_light/scrolllight2_b.jpg +b5aaf666 textures/base_light/scrolllight2_r.jpg +directory textures/base_support/ +b448bb2d textures/base_support/pipecolumn4.jpg +directory textures/base_trim/ +d5edaae0 textures/base_trim/pewterstep.jpg +776c601b textures/base_trim/slots1_1.jpg +directory textures/base_wall2/ +d2556d47 textures/base_wall2/ntrl_techfloor_kc.tga +3802617d textures/base_wall2/techfloor_kc.tga +80ca86cf textures/base_wall2/techfloor_kc_blue.tga +directory textures/cosmo_sfx/ +7a0f0ad5 textures/cosmo_sfx/decal2.jpg +directory textures/ctf/ +3cee5c74 textures/ctf/blue_telep.jpg +72b01881 textures/ctf/blue_telep2.jpg +054de3d8 textures/ctf/red_telep.jpg +b20b6b05 textures/ctf/red_telep2.jpg +directory textures/desertfactory_metal/ +829f22b4 textures/desertfactory_metal/metal01.tga +bdbbaaf0 textures/desertfactory_metal/metal02.tga +directory textures/desertfactory_misc/ +06d7a888 textures/desertfactory_misc/black01.tga +directory textures/e8/ +b56c9586 textures/e8/e8jumpspawn02b-1.jpg +649b0e88 textures/e8/e8jumpspawn02b-1_glow.jpg +b56c9586 textures/e8/e8jumpspawn02b-2.jpg +af63f391 textures/e8/e8jumpspawn02b-2_glow.jpg +b56c9586 textures/e8/e8jumpspawn02b-3.jpg +a8f2261e textures/e8/e8jumpspawn02b-3_glow.jpg +b56c9586 textures/e8/e8jumpspawn02b-4.jpg +3b44714a textures/e8/e8jumpspawn02b-4_glow.jpg +b56c9586 textures/e8/e8jumpspawn02b-5.jpg +0d145d85 textures/e8/e8jumpspawn02b-5_glow.jpg +b56c9586 textures/e8/e8jumpspawn02b-6.jpg +6cabe202 textures/e8/e8jumpspawn02b-6_glow.jpg +b56c9586 textures/e8/e8jumpspawn02b.jpg +7ec76808 textures/e8/e8jumpspawn02b_glow.jpg +bae52de6 textures/e8/e8_base1.jpg +18d1c4ea textures/e8/e8_base1c.jpg +directory textures/effects/ +2dd71ccb textures/effects/jumpcirc.jpg +3cee5c74 textures/effects/jumpcircblue.jpg +054de3d8 textures/effects/jumpcircred.jpg +f6fe4c22 textures/effects/largehelth_spec.jpg +80351e3c textures/effects/mediumhelth.jpg +00facaf2 textures/effects/mediumhelth_spec.jpg +1107c9a0 textures/effects/megahelth_spec.jpg +b1a52ac5 textures/effects/smallhelth.jpg +73de1e01 textures/effects/smallhelth_spec.jpg +directory textures/evil1_metals/ +54af60bb textures/evil1_metals/de-r_mtl.jpg +directory textures/evil2_misc/ +e894ec87 textures/evil2_misc/barrel_rst_sign.jpg +directory textures/evil6_lights/ +ce267000 textures/evil6_lights/e6v_light.jpg +44edcd7f textures/evil6_lights/e6v_light_glow.jpg +directory textures/evil8_base/ +65b12145 textures/evil8_base/e8clangfloor01.jpg +49c29255 textures/evil8_base/e8clangfloor04_blue.jpg +b4b05309 textures/evil8_base/e8_base1.jpg +5893eac3 textures/evil8_base/e8_base1c.jpg +directory textures/evil8_floor/ +65b12145 textures/evil8_floor/e8clangfloor01.jpg +a7d372ed textures/evil8_floor/e8clangfloor04_red.jpg +95b9fdab textures/evil8_floor/e8cretefloor01c.jpg +directory textures/evil8_fx/ +b56c9586 textures/evil8_fx/e8jumpspawn02b.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red-1.jpg +ed5a24cc textures/evil8_fx/e8jumpspawn02red-1_glow.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red-2.jpg +ecdd2d56 textures/evil8_fx/e8jumpspawn02red-2_glow.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red-3.jpg +71982b0d textures/evil8_fx/e8jumpspawn02red-3_glow.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red-4.jpg +c1d24210 textures/evil8_fx/e8jumpspawn02red-4_glow.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red-5.jpg +4b3e272e textures/evil8_fx/e8jumpspawn02red-5_glow.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red-6.jpg +4b6c0992 textures/evil8_fx/e8jumpspawn02red-6_glow.jpg +8551e6b9 textures/evil8_fx/e8jumpspawn02red.jpg +1ded2fbd textures/evil8_fx/e8jumpspawn02red_glow.jpg +7051e3b0 textures/evil8_fx/e8jumpspawn02_fx.jpg +0b43b94f textures/evil8_fx/e8jumpspawn02_fxr.jpg +directory textures/evil8_lights/ +d6c10a01 textures/evil8_lights/e8tinylight.jpg +directory textures/evil8_trim/ +2317b6b6 textures/evil8_trim/e8basictrim_blue.jpg +3498d89b textures/evil8_trim/e8basictrim_blue_glow.jpg +d192a0e0 textures/evil8_trim/e8basictrim_red.jpg +3eb73450 textures/evil8_trim/e8basictrim_red_glow.jpg +6cf7b6d5 textures/evil8_trim/e8beam01.jpg +37355c39 textures/evil8_trim/e8beam01b.jpg +7decd1d8 textures/evil8_trim/e8cretesmlltrim.jpg +2b38103a textures/evil8_trim/e8mtltrim1.jpg +23c64aa8 textures/evil8_trim/e8mtltrim1b.jpg +9045e2e0 textures/evil8_trim/e8support06.jpg +13c05818 textures/evil8_trim/e8_btrim03b.jpg +directory textures/gothic_block/ +404ce115 textures/gothic_block/killtrim.tga +directory textures/gothic_floor/ +6a70a2d9 textures/gothic_floor/q1metal7_99.tga +e89163b6 textures/gothic_floor/q1metal7_99_broke.tga +directory textures/gothic_trim/ +940c5361 textures/gothic_trim/column2c_test.jpg +0c9cad8e textures/gothic_trim/km_arena1tower1.jpg +directory textures/gothic_wall/ +76130dbb textures/gothic_wall/goldbrick.jpg +directory textures/liquids/ +57f73b22 textures/liquids/pool2_normal.tga +34e47886 textures/liquids/pool2_reflect.tga +directory textures/oafx/ +525ad8b7 textures/oafx/quadmultshell.jpg +44fabad1 textures/oafx/regenshell.jpg +94057a0c textures/oafx/suitshell.jpg +directory textures/proto2/ +e3b6d6fa textures/proto2/blueat_dcl.tga +6d6a84a0 textures/proto2/bluea_dcl.tga +c12b17f0 textures/proto2/redat_dcl.tga +a19555ac textures/proto2/reda_dcl.tga +directory textures/pulchr/ +8ac70316 textures/pulchr/airwalk-env.jpg +c0c2e29e textures/pulchr/back.jpg +dcc801ca textures/pulchr/beam-pulchr-white.jpg +4365b611 textures/pulchr/beam-teleporter.jpg +c2164f82 textures/pulchr/five-steps-ahead-pindel.tga +0b438368 textures/pulchr/five-steps-ahead.tga +c9095d57 textures/pulchr/listlight.tga +0097fd39 textures/pulchr/listlight_blend.tga +192cf134 textures/pulchr/pul1duelsky-a.jpg +e1a022de textures/pulchr/pul1duelsky-b.jpg +10f55f3c textures/pulchr/tele-swirl.tga +268b8e4f textures/pulchr/teleenv.jpg +dab79d7e textures/pulchr/telepulchr.tga +8596c404 textures/pulchr/twirl.tga +directory textures/pxl_fx/ +501f7955 textures/pxl_fx/jumpcircle.jpg +731f98c1 textures/pxl_fx/letter_a.tga +0ebeeb3d textures/pxl_fx/letter_b.tga +b8942ea4 textures/pxl_fx/weaponbase_spin_fx_lg.tga +f5e67d16 textures/pxl_fx/weaponbase_spin_fx_rg.tga +1ae1264c textures/pxl_fx/weaponbase_spin_fx_rl.tga +directory textures/pxl_wall/ +5282961a textures/pxl_wall/concrete1_cyan.jpg +29b71155 textures/pxl_wall/concrete1_green.jpg +661866e1 textures/pxl_wall/concrete1_orange.jpg +5bcab65b textures/pxl_wall/concrete1_red.jpg +directory textures/sfx/ +directory textures/sfx/130boom/ +fe68d957 textures/sfx/130boom/dpexplosion4_0000.tga +b5193d82 textures/sfx/130boom/dpexplosion4_0001.tga +e4ce0d8f textures/sfx/130boom/dpexplosion4_0002.tga +3a59a99d textures/sfx/130boom/dpexplosion4_0003.tga +7b293b0b textures/sfx/130boom/dpexplosion4_0004.tga +71b791c2 textures/sfx/130boom/dpexplosion4_0005.tga +d9511440 textures/sfx/130boom/dpexplosion4_0006.tga +293555ae textures/sfx/130boom/dpexplosion4_0007.tga +a19358df textures/sfx/130boom/dpexplosion4_0008.tga +7f0d4d5e textures/sfx/130boom/dpexplosion4_0009.tga +9364297c textures/sfx/130boom/dpexplosion4_0010.tga +47110d1d textures/sfx/130boom/dpexplosion4_0011.tga +ba321733 textures/sfx/130boom/dpexplosion4_0012.tga +b1192210 textures/sfx/130boom/dpexplosion4_0013.tga +8adb1b4f textures/sfx/130boom/dpexplosion4_0014.tga +5119a517 textures/sfx/130boom/dpexplosion4_0015.tga +41ce6d7a textures/sfx/130boom/dpexplosion4_0016.tga +93d4fd0c textures/sfx/130boom/dpexplosion4_0017.tga +6b077b83 textures/sfx/130boom/dpexplosion4_0018.tga +3f46ab5b textures/sfx/130boom/dpexplosion4_0019.tga +dc386454 textures/sfx/130boom/dpexplosion4_0020.tga +efab911f textures/sfx/130boom/dpexplosion4_0021.tga +8797b8d4 textures/sfx/130boom/dpexplosion4_0022.tga +038e70fd textures/sfx/130boom/dpexplosion4_0023.tga +9c004ce1 textures/sfx/130boom/dpexplosion4_0024.tga +a9cb3430 textures/sfx/130boom/dpexplosion4_0025.tga +eb0bf2be textures/sfx/130boom/dpexplosion4_0026.tga +e38b9db7 textures/sfx/130boom/dpexplosion4_0027.tga +19f50097 textures/sfx/130boom/dpexplosion4_0028.tga +272bdb5c textures/sfx/130boom/dpexplosion4_0029.tga +a5b46723 textures/sfx/beam.jpg +5999c9e2 textures/sfx/beam_1.jpg +2a7c2db0 textures/sfx/beam_blue4.jpg +d1c26583 textures/sfx/beam_red.jpg +c24bd21a textures/sfx/beam_waterlight.jpg +fd96fa0b textures/sfx/beam_waterlight.tga +e45d8179 textures/sfx/b_flame1-blend.tga +44126161 textures/sfx/b_flame1.tga +d691fae5 textures/sfx/b_flame2.tga +a4eac372 textures/sfx/b_flame3.tga +eccd6dac textures/sfx/b_flame4.tga +b5a5c7be textures/sfx/b_flame5.tga +b1575a72 textures/sfx/b_flame6.tga +efa7848f textures/sfx/b_flame7.tga +37753ac6 textures/sfx/b_flame8.tga +5ff02047 textures/sfx/flame1-blend.tga +c2bea804 textures/sfx/flame1.tga +e94e7f90 textures/sfx/flame2.tga +057b1a54 textures/sfx/flame3.tga +fc759ba9 textures/sfx/flame4.tga +52810920 textures/sfx/flame5.tga +2339fd64 textures/sfx/flame6.tga +2f3531c7 textures/sfx/flame7.tga +049d3ab9 textures/sfx/flame8.tga +e3ddce47 textures/sfx/g_flame1.tga +6b31e71a textures/sfx/g_flame2.tga +9cdceaf2 textures/sfx/g_flame3.tga +e093fc7e textures/sfx/g_flame4.tga +af937bd2 textures/sfx/g_flame5.tga +98ed44cd textures/sfx/g_flame6.tga +7ad7e19c textures/sfx/g_flame7.tga +c17ab40b textures/sfx/g_flame8.tga +3c1af2e4 textures/sfx/logo256.tga +9ff4a5f4 textures/sfx/r_flame1-blend.tga +93817a2c textures/sfx/r_flame1.tga +79546677 textures/sfx/r_flame2.tga +5001c608 textures/sfx/r_flame3.tga +54005208 textures/sfx/r_flame4.tga +80a00e3e textures/sfx/r_flame5.tga +6536c53e textures/sfx/r_flame6.tga +24529f52 textures/sfx/r_flame7.tga +58571263 textures/sfx/r_flame8.tga +directory textures/symbols/ +d3c604a9 textures/symbols/blueteam.jpg +9b88d752 textures/symbols/blueteam.pcx +directory textures/symbols/lossless/ +be4ffcf7 textures/symbols/lossless/blueteam.tga +4d87c9fa textures/symbols/lossless/redteam.tga +75ca63df textures/symbols/redteam.jpg +16fb5309 textures/symbols/redteam.pcx +directory vm/ +4c6fe463 vm/cgame.qvm +bb90ea00 vm/qagame.qvm +e27f432e vm/ui.qvm diff -Nru openarena-085-data-0.8.5split/debian/pak6-patch088.svn947 openarena-085-data-0.8.5split/debian/pak6-patch088.svn947 --- openarena-085-data-0.8.5split/debian/pak6-patch088.svn947 1970-01-01 00:00:00.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/pak6-patch088.svn947 2014-08-18 11:38:43.000000000 +0000 @@ -0,0 +1,32 @@ +source/assets/2d/ +source/assets/maps/ +source/assets/models/angelyss/ +source/assets/models/cosmomodels/ +source/assets/models/fan/ +source/assets/models/gargoyle/ +source/assets/models/mapobjects/ +source/assets/models/neko/ +source/assets/models/newerflag/ +source/assets/models/newflag/ +source/assets/models/powerups/shield.blend +source/assets/music/ +source/assets/sound/pulchr/forcewalk.txt +source/assets/textures/acc/Wallbot.psd.tar.bz2 +source/assets/textures/acc/Wallbotcracksb.psd.tar.bz2 +source/assets/textures/acc/Wallbotoa.psd.tar.bz2 +source/assets/textures/acc/concrete.psd.tar.bz2 +source/assets/textures/acc/concrt.psd.tar.bz2 +source/assets/textures/acc/concrtcrackA.psd.tar.bz2 +source/assets/textures/acc/concrtcracks.psd.tar.bz2 +source/assets/textures/acc/concrttrim.psd.tar.bz2 +source/assets/textures/base_floor/ +source/assets/textures/base_light/ +source/assets/textures/base_support/ +source/assets/textures/base_trim/ +source/assets/textures/base_wall2/ +source/assets/textures/gothic_floor/q1metal7_99.xcf +source/assets/textures/gothic_trim/ +source/assets/textures/gothic_wall/ +source/assets/textures/gothic_wall/ +source/assets/textures/proto2/arrows.xcf +source/assets/textures/pulchr/ diff -Nru openarena-085-data-0.8.5split/debian/README.source openarena-085-data-0.8.5split/debian/README.source --- openarena-085-data-0.8.5split/debian/README.source 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/README.source 2014-08-18 11:38:43.000000000 +0000 @@ -39,7 +39,9 @@ want to break compatibility, modify those files. (But don't do that.) As a result of the "add instead of replacing" approach, all PK3 files in -OpenArena 0.8.5, except for pak6-patch085, are actually from OpenArena 0.8.1. +OpenArena 0.8.8 are actually from OpenArena 0.8.1, except for +pak6-patch085.pk3 and pak6-patch088.pk3 which are from 0.8.5 and 0.8.8 +respectively. QVM bytecode not supplied in Debian ----------------------------------- @@ -76,9 +78,10 @@ that in practice the preferred form for modification is the combination of the source and exported files. -It appears that upstream svn revision 901 corresponds to 0.8.1, and revision +It appears that upstream svn revision 901 corresponds to 0.8.1, revision 931 corresponds to 0.8.5 (some of the exported files were renamed in r926, -but that's not relevant to obtaining sources). +but that's not relevant to obtaining sources), and revision 947 corresponds +to 0.8.8. Assets from the PK3 files, and the source files for them, are not included in the pkg-games git repository due to their size; please obtain them from the @@ -96,6 +99,9 @@ * Unpack CREDITS and readme_085.txt from oa085p.zip, and rename CREDITS to CREDITS-0.8.5 +* Unpack CREDITS and readme_088.txt from oa088p.zip, and rename CREDITS to + CREDITS-0.8.8 + * Copy at least the upstream PK3 files listed in debian/openarena-data.paks to the base directory (replacing openarena-data with the name of the source package) @@ -110,7 +116,7 @@ - list the contents of each PK3 file, with their CRC32s, to debian/pak0.pk3.contents (etc.) - unpack ../pak0.pk3 to pak0/ (etc.), omitting any QVM files - - check out upstream svn revisions 901 and 931 of /source/assets/ into + - check out upstream svn revisions 901, 931, 947 of /source/assets/ into debian/svn-r*/ (which are excluded from the tarballs) - delete some non-GPL files from debian/svn-r*/source/assets/ which have been excised from releases but are still in svn for some reason diff -Nru openarena-085-data-0.8.5split/debian/rules openarena-085-data-0.8.5split/debian/rules --- openarena-085-data-0.8.5split/debian/rules 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/rules 2014-08-18 11:38:43.000000000 +0000 @@ -13,11 +13,14 @@ tardir := $(source)-$(upstreamversion).orig paks := $(shell cat debian/$(source).paks) -build: \ +build: build-arch build-indep +build-arch: +build-indep: \ $(patsubst %,build/%,$(paks)) \ $(patsubst %,check/%,$(paks)) \ - debian/openarena-data.README.Debian \ - debian/openarena-085-data.README.Debian + debian/openarena-085-data.README.Debian \ + debian/openarena-088-data.README.Debian \ + debian/openarena-data.README.Debian build/%: set -e && sed -n -e 's/#.*//; s/\.qvm$$//p;' < debian/$*.pk3.contents | \ @@ -48,10 +51,18 @@ grep "NTVEpak6-patch085" pak6-patch085/vm/qagame.qvm grep "NTVEpak6-patch085" pak6-patch085/vm/ui.qvm +check/pak6-patch088: build/pak6-patch088 + grep "NTVEpak6-patch088" pak6-patch088/vm/cgame.qvm + grep "NTVEpak6-patch088" pak6-patch088/vm/qagame.qvm + grep "NTVEpak6-patch088" pak6-patch088/vm/ui.qvm + # otherwise there's nothing to check check/%: build/% : +debian/openarena-088-data.README.Debian: debian/qvms.README.Debian + install -m644 $< $@ + debian/openarena-085-data.README.Debian: debian/qvms.README.Debian install -m644 $< $@ @@ -85,8 +96,9 @@ unzip -o -j mp-pak0.pk3 ../COPYING ../CREDITS; \ fi # r901 is 0.8.1; r931 is 0.8.5 (despite the commit message) + # r947 is 0.8.8 # source/assets/textures/trak/ are not GPL-compatible - set -e && for r in 901 931; do \ + set -e && for r in 901 931 947; do \ install -d debian/svn-r$$r/source; \ test -d debian/svn-r$$r/source/assets || svn export -r$$r \ http://www.openarena.ws/svn/source/assets \ @@ -107,6 +119,6 @@ set -e && for x in $(paks) source; do \ cp -al $$x $(tardir)/$$x; \ done - install -m644 CHANGES COPYING CREDITS CREDITS-0.8.5 LINUXNOTES README WENEED readme_085.txt $(tardir) + install -m644 CHANGES COPYING CREDITS CREDITS-0.8.5 CREDITS-0.8.8 LINUXNOTES README WENEED readme_085.txt readme_088.txt $(tardir) tar -jvcf ../$(tarball) $(tardir) rm -rf $(tardir) diff -Nru openarena-085-data-0.8.5split/debian/source/include-binaries openarena-085-data-0.8.5split/debian/source/include-binaries --- openarena-085-data-0.8.5split/debian/source/include-binaries 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/source/include-binaries 2014-08-18 11:38:43.000000000 +0000 @@ -7,3 +7,6 @@ debian/pak6-patch085-087acd9c.qvm debian/pak6-patch085-438cf2c5.qvm debian/pak6-patch085-6602cd55.qvm +debian/pak6-patch088-4c6fe463.qvm +debian/pak6-patch088-e27f432e.qvm +debian/pak6-patch088-bb90ea00.qvm diff -Nru openarena-085-data-0.8.5split/debian/source/options openarena-085-data-0.8.5split/debian/source/options --- openarena-085-data-0.8.5split/debian/source/options 2011-07-15 12:38:03.000000000 +0000 +++ openarena-085-data-0.8.5split/debian/source/options 2014-08-18 11:38:43.000000000 +0000 @@ -1,2 +1,2 @@ tar-ignore=debian/svn-r* -extend-diff-ignore=debian/svn-r.* +extend-diff-ignore=debian/svn-r.*|CREDITS-0\.8\.8|readme_088\.txt