[openarena-data] 01/02: Merge branch 'master' into openarena-088-data

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-088-data
in repository openarena-data.

commit b0498176335ca32c222e922da0106e55684bc665
Merge: 05555d3 aea947a
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Oct 30 11:03:39 2017 +0000

    Merge branch 'master' into openarena-088-data

 CHANGES                           | 226 -------------------------
 COPYING                           | 340 --------------------------------------
 CREDITS                           |  76 ---------
 CREDITS-0.8.5                     |  78 ---------
 CREDITS-0.8.8                     |  90 ----------
 LINUXNOTES                        |   5 -
 README                            |  86 ----------
 WENEED                            |  11 --
 debian/README.source              |   5 -
 debian/changelog                  |  14 ++
 debian/compat                     |   2 +-
 debian/control                    |   5 +-
 debian/copyright                  |   2 +-
 debian/mp-pak0-449831c5.qvm       | Bin 23 -> 0 bytes
 debian/mp-pak0-73428e1b.qvm       | Bin 23 -> 0 bytes
 debian/mp-pak0-c8703d61.qvm       | Bin 23 -> 0 bytes
 debian/pak0-37554497.qvm          | Bin 20 -> 0 bytes
 debian/pak0-b2b99e5d.qvm          | Bin 20 -> 0 bytes
 debian/pak0-d2225dd5.qvm          | Bin 20 -> 0 bytes
 debian/pak6-patch085-087acd9c.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch085-438cf2c5.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch085-6602cd55.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch088-4c6fe463.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch088-bb90ea00.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch088-e27f432e.qvm | Bin 29 -> 0 bytes
 debian/qvmbrute.c                 |  10 ++
 debian/source/lintian-overrides   |   2 -
 debian/source/local-options       |   1 -
 debian/source/options             |   2 +-
 readme_085.txt                    |  70 --------
 readme_088.txt                    | 133 ---------------
 31 files changed, 30 insertions(+), 1128 deletions(-)

diff --cc debian/changelog
index 0316f61,ceca587..8df0ef6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -87,18 -95,6 +87,32 @@@ openarena-data (0.8.5split-3) unstable
  
   -- Simon McVittie <smcv at debian.org>  Mon, 18 Aug 2014 10:42:55 +0100
  
 +openarena-088-data (0.8.8-1) unstable; urgency=low
 +
 +  * Update common files for 0.8.8
 +  * Support build-arch, build-indep
 +  * Standards-Version: 3.9.3 (no changes)
 +  * New branch of the source package for the 0.8.8 game data
 +  * Breaks: openarena (<< 0.8.1-8~) and the corresponding openarena-server,
 +    which are the oldest versions which look in /usr/share (newer versions
 +    use symlinks in /usr/lib)
 +
 + -- Simon McVittie <smcv at debian.org>  Sun, 26 Feb 2012 19:08:18 +0000
 +
++openarena-data (0.8.5split-10) unstable; urgency=medium
++
++  * Use https URL for the Format of d/copyright
++  * Declare compliance with Debian Policy v4.1.1
++  * Move to debhelper compat level 10
++  * Remove pre-generated QVM files from source package, so that building
++    the package proves they can be regenerated
++  * d/qvmbrute.c: Include timing information
++  * Remove unused lintian overrides
++  * Set Rules-Requires-Root to no
++  * Remove all upstream files from packaging git repository
++
++ -- Simon McVittie <smcv at debian.org>  Mon, 30 Oct 2017 11:00:15 +0000
++
  openarena-data (0.8.5split-2) unstable; urgency=low
  
    * Apply patch from Ubuntu to fix linking with more recent ld
diff --cc debian/control
index c768484,9f4b105..66bfe55
--- a/debian/control
+++ b/debian/control
@@@ -11,14 -11,21 +11,15 @@@ Build-Depends-Indep
   libarchive-zip-perl,
   zip,
   zlib1g-dev,
- Standards-Version: 3.9.8
+ Rules-Requires-Root: no
+ Standards-Version: 4.1.1
  Homepage: http://www.openarena.ws/
 -Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git
 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/
 +Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b openarena-088-data
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-088-data
  
 -Package: openarena-data
 +Package: openarena-088-data
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
   ${misc:Depends},
  Breaks:
   openarena (<< 0.8.1-8~),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git