[openarena-data] 02/02: Merge tag 'debian/openarena-data/0.8.5split-7' into openarena-oacmp1

[Simon McVittie]

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

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

commit 6c5f56f30de5fb0e10d4914a9c5a4c37b0a89b7b
Merge: c6d790b 231f227
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 24 10:39:49 2016 +0000

    Merge tag 'debian/openarena-data/0.8.5split-7' into openarena-oacmp1
    
    openarena-data Debian release 0.8.5split-7

 debian/changelog | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 57194cd,1466bb7..76009ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,21 +1,25 @@@
 -openarena-data (0.8.5split-7) unstable; urgency=medium
 +openarena-oacmp1 (3-2) UNRELEASED; urgency=medium
 +
-   * Standards-Version: 3.9.7 (no changes needed)
-   * Normalize packaging via wrap-and-sort -abst
-   * Use https for Vcs-Git (lintian: vcs-field-uses-insecure-uri)
-   * gbp.conf: do not set export-dir, tarball-dir: this is a local
-     preference for the developer doing the build, not something that
-     should be in the VCS
-   * Verify at dh_builddeb time that the PK3 is compatible with upstream
-   * Do not put the PK3 files through dh_strip_nondeterminism: order
-     is important for these files (see #819113)
-   * Clean up generated openarena-088-data.README.Debian
++  * Merge from openarena-data/0.8.5split-7:
++    - Standards-Version: 3.9.7 (no changes needed)
++    - Normalize packaging via wrap-and-sort -abst
++    - Use https for Vcs-Git (lintian: vcs-field-uses-insecure-uri)
++    - gbp.conf: do not set export-dir, tarball-dir: this is a local
++      preference for the developer doing the build, not something that
++      should be in the VCS
++    - Verify at dh_builddeb time that the PK3 is compatible with upstream
++    - Do not put the PK3 files through dh_strip_nondeterminism: order
++      is important for these files (see #819113)
++    - Clean up generated openarena-088-data.README.Debian
 +
 + -- Simon McVittie <smcv at debian.org>  Sat, 09 May 2015 11:00:18 +0100
 +
 +openarena-oacmp1 (3-1) unstable; urgency=medium
  
    * Switch Vcs-Browser to cgit and https
 -  * Add shared files for the OpenArena Community Map Pack, volume 1
 -    (available as the openarena-oacmp1 source package, but the majority
 -    of the debian/ directory is duplicated to simplify merging)
 -  * Standards-Version: 3.9.7 (no changes needed)
 -  * Normalize packaging via wrap-and-sort -abst
 -  * Use https for Vcs-Git (lintian: vcs-field-uses-insecure-uri)
 -  * gbp.conf: do not set export-dir, tarball-dir: this is a local
 -    preference for the developer doing the build, not something that
 -    should be in the VCS
 -  * Verify at dh_builddeb time that the PK3 is compatible with upstream
 -  * Do not put the PK3 files through dh_strip_nondeterminism: order
 -    is important for these files (see #819113)
 -  * Clean up generated openarena-088-data.README.Debian
 -
 - -- Simon McVittie <smcv at debian.org>  Thu, 24 Mar 2016 10:23:22 +0000
 +  * New source package for the OpenArena Community Map Pack, volume 1
 +
 + -- Simon McVittie <smcv at debian.org>  Sat, 09 May 2015 14:29:46 +0100
  
  openarena-data (0.8.5split-6) unstable; urgency=medium
  

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