[openarena-data] 02/03: Merge branch 'openarena-data' into openarena-085-data

[Simon McVittie]

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

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

commit 6ead599b8c339f9c6e6b0d2740647cf91f4d81f3
Merge: a4ff3a4 77f1c48
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 16 08:42:05 2018 +0000

    Merge branch 'openarena-data' into openarena-085-data

 debian/changelog | 2 +-
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 44320bb,736c6c5..e10d47a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,6 @@@
 -openarena-data (0.8.5split-11) UNRELEASED; urgency=medium
 +openarena-085-data (0.8.5split-11) UNRELEASED; urgency=medium
  
-   * Declare compliance with Debian Policy v4.1.2
+   * Declare compliance with Debian Policy v4.1.3
    * d/README.source: Document non-DEP-14 Debian packaging repository
      layout
    * Update Vcs-* for move to salsa.debian.org
diff --cc debian/control
index 62b84bb,14f88cd..4f2c218
--- a/debian/control
+++ b/debian/control
@@@ -12,18 -12,25 +12,18 @@@ Build-Depends-Indep
   zip,
   zlib1g-dev,
  Rules-Requires-Root: no
- Standards-Version: 4.1.2
+ Standards-Version: 4.1.3
  Homepage: http://www.openarena.ws/
 -Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b openarena-data
 -Vcs-Browser: https://salsa.debian.org/games-team/openarena-data/tree/openarena-data
 +Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b openarena-085-data
 +Vcs-Browser: https://salsa.debian.org/games-team/openarena-data/tree/openarena-085-data
  
 -Package: openarena-data
 +Package: openarena-085-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~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 +Replaces:
 + openarena-data (<< 0.8.5split),
 +Description: OpenArena game data - 0.8.5 update
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

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