[openarena-data] 03/04: Normalize packaging via wrap-and-sort -abst

[Simon McVittie]

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

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

commit 506d4456cf29121887591f36da049124c8996660
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 2 10:00:50 2016 +0000

    Normalize packaging via wrap-and-sort -abst
---
 debian/changelog                |  1 +
 debian/control                  | 32 ++++++++++++++++++++------------
 debian/openarena-085-data.links |  2 +-
 debian/openarena-088-data.links |  2 +-
 debian/openarena-data.install   |  2 +-
 debian/openarena-oacmp1.install |  2 +-
 debian/openarena-oacmp1.links   |  4 ++--
 7 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f434961..8b61620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
     (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
 
  -- Simon McVittie <smcv at debian.org>  Sat, 09 May 2015 11:00:18 +0100
 
diff --git a/debian/control b/debian/control
index 92a8796..18e9898 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,15 @@ Source: openarena-data
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>,
-           Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev
+Uploaders:
+ Bruno "Fuddl" Kleinert <fuddl at tauware.de>,
+ Simon McVittie <smcv at debian.org>,
+Build-Depends:
+ debhelper (>= 9),
+Build-Depends-Indep:
+ libarchive-zip-perl,
+ zip,
+ zlib1g-dev,
 Standards-Version: 3.9.7
 Homepage: http://www.openarena.ws/
 Vcs-Git: git://anonscm.debian.org/pkg-games/openarena-data.git
@@ -13,14 +18,17 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/
 
 Package: openarena-data
 Architecture: all
-Depends: ${misc:Depends},
-         openarena-081-maps,
-         openarena-081-players,
-         openarena-081-players-mature,
-         openarena-081-textures,
-         openarena-081-misc,
-         openarena-085-data
-Breaks: openarena-server (<< 0.8.1-8~), openarena (<< 0.8.1-8~)
+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
  OpenArena is an open-source content package for the Quake III
  engine, effectively creating a free stand-alone game similar to
diff --git a/debian/openarena-085-data.links b/debian/openarena-085-data.links
index 16ec038..0e18b91 100644
--- a/debian/openarena-085-data.links
+++ b/debian/openarena-085-data.links
@@ -1,2 +1,2 @@
-usr/share/doc/openarena-085-data/readme_085.txt usr/share/doc/openarena-085-data/README
 usr/share/doc/openarena-085-data/CREDITS-0.8.5 usr/share/doc/openarena-085-data/CREDITS
+usr/share/doc/openarena-085-data/readme_085.txt usr/share/doc/openarena-085-data/README
diff --git a/debian/openarena-088-data.links b/debian/openarena-088-data.links
index fdfbd6d..d1bcd75 100644
--- a/debian/openarena-088-data.links
+++ b/debian/openarena-088-data.links
@@ -1,2 +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
+usr/share/doc/openarena-088-data/readme_088.txt usr/share/doc/openarena-088-data/README
diff --git a/debian/openarena-data.install b/debian/openarena-data.install
index 1e0b2f5..f85cd68 100644
--- a/debian/openarena-data.install
+++ b/debian/openarena-data.install
@@ -1,2 +1,2 @@
-pak0.pk3 usr/share/games/openarena/baseoa
 mp-pak0.pk3 usr/share/games/openarena/missionpack
+pak0.pk3 usr/share/games/openarena/baseoa
diff --git a/debian/openarena-oacmp1.install b/debian/openarena-oacmp1.install
index 70f4073..5ed104d 100644
--- a/debian/openarena-oacmp1.install
+++ b/debian/openarena-oacmp1.install
@@ -1,3 +1,3 @@
+oacmp-volume1-v3/oacmp-mod/description.txt usr/share/games/openarena/oacmp-mod
 z_oacmp-volume1-v3.pk3 usr/share/games/openarena/baseoa
 z_oacmpcampaign.pk3 usr/share/games/openarena/oacmp-mod
-oacmp-volume1-v3/oacmp-mod/description.txt usr/share/games/openarena/oacmp-mod
diff --git a/debian/openarena-oacmp1.links b/debian/openarena-oacmp1.links
index 4a18edc..bfc9af3 100644
--- a/debian/openarena-oacmp1.links
+++ b/debian/openarena-oacmp1.links
@@ -1,4 +1,4 @@
-usr/share/games/openarena/baseoa/z_oacmp-volume1-v3.pk3 usr/lib/openarena/baseoa/z_oacmp-volume1-v3.pk3
 usr/share/games/openarena/baseoa/z_oacmp-volume1-v3.pk3 usr/lib/openarena-server/baseoa/z_oacmp-volume1-v3.pk3
-usr/share/games/openarena/oacmp-mod usr/lib/openarena/oacmp-mod
+usr/share/games/openarena/baseoa/z_oacmp-volume1-v3.pk3 usr/lib/openarena/baseoa/z_oacmp-volume1-v3.pk3
 usr/share/games/openarena/oacmp-mod usr/lib/openarena-server/oacmp-mod
+usr/share/games/openarena/oacmp-mod usr/lib/openarena/oacmp-mod

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