[openarena] 07/11: Normalize packaging through `wrap-and-sort -abst`

Simon McVittie smcv at debian.org
Fri Jan 22 12:06:14 UTC 2016 

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

smcv pushed a commit to branch master
in repository openarena.

commit c96fe67218b38579f3ffb1e769c9ffab76a344db
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 22 10:27:36 2016 +0000

    Normalize packaging through `wrap-and-sort -abst`
---
 debian/changelog                |   1 +
 debian/control                  | 100 ++++++++++++++++++++++------------------
 debian/openarena-server.install |   5 +-
 debian/openarena-server.links   |  10 ++--
 debian/openarena.install        |   2 +-
 debian/openarena.links          |   8 ++--
 6 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ae319b..2ae904a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openarena (0.8.8-15) UNRELEASED; urgency=medium
   * Stop installing the legacy Debian menu file
     - stop converting the icon to XPM format
     - no longer needs a build-dependency on imagemagick
+  * Normalize packaging through `wrap-and-sort -abst`
 
  -- Simon McVittie <smcv at debian.org>  Sun, 02 Aug 2015 14:15:44 +0100
 
diff --git a/debian/control b/debian/control
index da64cf5..57943fe 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,36 @@ Source: openarena
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
-           Gonéri Le Bouder <goneri at rulezlan.org>,
-           Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 9),
-               dpkg-dev (>= 1.16.1),
-               ioquake3-server (>= 1.36+u20150730+dfsg1-1~),
+Uploaders:
+ Bruno "Fuddl" Kleinert <fuddl at debian.org>,
+ Gonéri Le Bouder <goneri at rulezlan.org>,
+ Simon McVittie <smcv at debian.org>,
+Build-Depends:
+ debhelper (>= 9),
+ dpkg-dev (>= 1.16.1),
+ ioquake3-server (>= 1.36+u20150730+dfsg1-1~),
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/openarena.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena.git/
 Homepage: http://openarena.ws/
 
 Package: openarena
-Architecture: linux-any kfreebsd-any hurd-any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-         ioquake3 (>= 1.36+u20130504),
-         openarena-081-maps,
-         openarena-081-misc,
-         openarena-081-players,
-         openarena-081-players-mature,
-         openarena-081-textures,
-         openarena-085-data,
-         openarena-088-data,
-         openarena-data (>= 0.8.5-3~), openarena-data (<< 0.8.6~)
-Recommends: openarena-oacmp1
+Architecture: hurd-any kfreebsd-any linux-any
+Depends:
+ ioquake3 (>= 1.36+u20130504),
+ openarena-081-maps,
+ openarena-081-misc,
+ openarena-081-players,
+ openarena-081-players-mature,
+ openarena-081-textures,
+ openarena-085-data,
+ openarena-088-data,
+ openarena-data (<< 0.8.6~),
+ openarena-data (>= 0.8.5-3~),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ openarena-oacmp1,
 Description: fast-paced 3D first-person shooter
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free
@@ -36,35 +42,15 @@ Description: fast-paced 3D first-person shooter
  .
  This package installs the OpenArena client.
 
-Package: openarena-server
-Architecture: linux-any kfreebsd-any hurd-any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-         adduser,
-         ioquake3-server (>= 1.36+u20130504),
-         openarena-081-maps,
-         openarena-081-misc,
-         openarena-081-players,
-         openarena-081-players-mature,
-         openarena-081-textures,
-         openarena-085-data,
-         openarena-088-data,
-         openarena-data (>= 0.8.5), openarena-data (<< 0.8.6~)
-Suggests: openarena-oacmp1
-Description: server and game logic for the game OpenArena
- OpenArena is an open-source content package for ioQuake3 licensed under the
- GPL, effectively creating a free stand-alone game. Though OpenArena is a free
- replacement for id Software Inc.'s Quake 3 Arena, it is NOT compatible with
- the proprietary game!
- .
- This package installs the OpenArena dedicated server and its init script.
-
 Package: openarena-dbg
 Section: debug
 Priority: extra
-Architecture: linux-any kfreebsd-any hurd-any
-Depends: openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}),
-         ${misc:Depends}
-Recommends: ioquake3-dbg
+Architecture: hurd-any kfreebsd-any linux-any
+Depends:
+ openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}),
+ ${misc:Depends},
+Recommends:
+ ioquake3-dbg,
 Description: debug symbols for OpenArena's game logic
  OpenArena is an open-source content package for ioQuake3 licensed under the
  GPL, effectively creating a free stand-alone game. Though OpenArena is a free
@@ -73,3 +59,29 @@ Description: debug symbols for OpenArena's game logic
  .
  This package contains debug symbols which can be used to debug crashes in
  OpenArena's game logic.
+
+Package: openarena-server
+Architecture: hurd-any kfreebsd-any linux-any
+Depends:
+ adduser,
+ ioquake3-server (>= 1.36+u20130504),
+ openarena-081-maps,
+ openarena-081-misc,
+ openarena-081-players,
+ openarena-081-players-mature,
+ openarena-081-textures,
+ openarena-085-data,
+ openarena-088-data,
+ openarena-data (<< 0.8.6~),
+ openarena-data (>= 0.8.5),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Suggests:
+ openarena-oacmp1,
+Description: server and game logic for the game OpenArena
+ OpenArena is an open-source content package for ioQuake3 licensed under the
+ GPL, effectively creating a free stand-alone game. Though OpenArena is a free
+ replacement for id Software Inc.'s Quake 3 Arena, it is NOT compatible with
+ the proprietary game!
+ .
+ This package installs the OpenArena dedicated server and its init script.
diff --git a/debian/openarena-server.install b/debian/openarena-server.install
index 6cea677..7de6996 100644
--- a/debian/openarena-server.install
+++ b/debian/openarena-server.install
@@ -1,5 +1,4 @@
-debian/server.cfg etc/openarena-server
-debian/scripts/openarena-server usr/games
 debian/openarena-server at .service lib/systemd/system
-
+debian/scripts/openarena-server usr/games
+debian/server.cfg etc/openarena-server
 debian/tmp/usr/lib/openarena-server/*/*.so
diff --git a/debian/openarena-server.links b/debian/openarena-server.links
index 87c216e..5454553 100644
--- a/debian/openarena-server.links
+++ b/debian/openarena-server.links
@@ -1,19 +1,17 @@
-etc/openarena-server usr/lib/openarena-server/baseoa/etc/openarena-server
 # backwards compat with older openarena-server
+etc/openarena-server usr/lib/openarena-server/baseoa/etc/openarena-server
 etc/openarena-server/server.cfg usr/lib/openarena-server/baseoa/debian_server.cfg
-usr/share/doc/openarena-data/changelog.gz usr/share/doc/openarena-server/changelog.gz
 usr/share/doc/openarena-088-data/CREDITS-0.8.8 usr/share/doc/openarena-server/CREDITS
-usr/share/doc/openarena-data/LINUXNOTES.gz usr/share/doc/openarena-server/LINUXNOTES.gz
 usr/share/doc/openarena-088-data/readme_088.txt.gz usr/share/doc/openarena-server/README.gz
-
+usr/share/doc/openarena-data/LINUXNOTES.gz usr/share/doc/openarena-server/LINUXNOTES.gz
+usr/share/doc/openarena-data/changelog.gz usr/share/doc/openarena-server/changelog.gz
 usr/share/games/openarena/baseoa/pak0.pk3 usr/lib/openarena-server/baseoa/pak0.pk3
 usr/share/games/openarena/baseoa/pak1-maps.pk3 usr/lib/openarena-server/baseoa/pak1-maps.pk3
-usr/share/games/openarena/baseoa/pak2-players.pk3 usr/lib/openarena-server/baseoa/pak2-players.pk3
 usr/share/games/openarena/baseoa/pak2-players-mature.pk3 usr/lib/openarena-server/baseoa/pak2-players-mature.pk3
+usr/share/games/openarena/baseoa/pak2-players.pk3 usr/lib/openarena-server/baseoa/pak2-players.pk3
 usr/share/games/openarena/baseoa/pak4-textures.pk3 usr/lib/openarena-server/baseoa/pak4-textures.pk3
 usr/share/games/openarena/baseoa/pak5-TA.pk3 usr/lib/openarena-server/baseoa/pak5-TA.pk3
 usr/share/games/openarena/baseoa/pak6-misc.pk3 usr/lib/openarena-server/baseoa/pak6-misc.pk3
 usr/share/games/openarena/baseoa/pak6-patch085.pk3 usr/lib/openarena-server/baseoa/pak6-patch085.pk3
 usr/share/games/openarena/baseoa/pak6-patch088.pk3 usr/lib/openarena-server/baseoa/pak6-patch088.pk3
-
 usr/share/games/openarena/missionpack/mp-pak0.pk3 usr/lib/openarena-server/missionpack/mp-pak0.pk3
diff --git a/debian/openarena.install b/debian/openarena.install
index a4dfef2..7052c6b 100644
--- a/debian/openarena.install
+++ b/debian/openarena.install
@@ -1,5 +1,5 @@
-debian/scripts/openarena usr/games
 debian/openarena.desktop usr/share/applications
 debian/openarena128.png usr/share/icons/hicolor/128x128/apps
+debian/scripts/openarena usr/games
 debian/tmp/usr/lib/openarena/*/*.so
 debian/tmp/usr/lib/openarena/*/*/*.so
diff --git a/debian/openarena.links b/debian/openarena.links
index 7c8d42c..c866ee2 100644
--- a/debian/openarena.links
+++ b/debian/openarena.links
@@ -1,16 +1,14 @@
-usr/share/doc/openarena-data/changelog.gz usr/share/doc/openarena/changelog.gz
 usr/share/doc/openarena-088-data/CREDITS-0.8.8 usr/share/doc/openarena/CREDITS
-usr/share/doc/openarena-data/LINUXNOTES.gz usr/share/doc/openarena/LINUXNOTES.gz
 usr/share/doc/openarena-088-data/readme_088.txt.gz usr/share/doc/openarena/README.gz
-
+usr/share/doc/openarena-data/LINUXNOTES.gz usr/share/doc/openarena/LINUXNOTES.gz
+usr/share/doc/openarena-data/changelog.gz usr/share/doc/openarena/changelog.gz
 usr/share/games/openarena/baseoa/pak0.pk3 usr/lib/openarena/baseoa/pak0.pk3
 usr/share/games/openarena/baseoa/pak1-maps.pk3 usr/lib/openarena/baseoa/pak1-maps.pk3
-usr/share/games/openarena/baseoa/pak2-players.pk3 usr/lib/openarena/baseoa/pak2-players.pk3
 usr/share/games/openarena/baseoa/pak2-players-mature.pk3 usr/lib/openarena/baseoa/pak2-players-mature.pk3
+usr/share/games/openarena/baseoa/pak2-players.pk3 usr/lib/openarena/baseoa/pak2-players.pk3
 usr/share/games/openarena/baseoa/pak4-textures.pk3 usr/lib/openarena/baseoa/pak4-textures.pk3
 usr/share/games/openarena/baseoa/pak5-TA.pk3 usr/lib/openarena/baseoa/pak5-TA.pk3
 usr/share/games/openarena/baseoa/pak6-misc.pk3 usr/lib/openarena/baseoa/pak6-misc.pk3
 usr/share/games/openarena/baseoa/pak6-patch085.pk3 usr/lib/openarena/baseoa/pak6-patch085.pk3
 usr/share/games/openarena/baseoa/pak6-patch088.pk3 usr/lib/openarena/baseoa/pak6-patch088.pk3
-
 usr/share/games/openarena/missionpack/mp-pak0.pk3 usr/lib/openarena/missionpack/mp-pak0.pk3

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

More information about the Pkg-games-commits mailing list