[ioquake3] 05/07: Partially normalize packaging through wrap-and-sort

Fri Jan 22 12:06:12 UTC 2016

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

smcv pushed a commit to branch master
in repository ioquake3.

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

    Partially normalize packaging through wrap-and-sort
    
    The .install files are not entirely sorted to preserve the
    relationship between comments and the files they refer to.
---
 debian/changelog               |  3 +++
 debian/control                 | 57 +++++++++++++++++++++++-------------------
 debian/copyright               |  6 ++---
 debian/ioquake3-server.install |  5 ++--
 debian/ioquake3.docs           |  2 +-
 debian/ioquake3.install        |  2 +-
 6 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd27c16..9247337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ioquake3 (1.36+u20160122+dfsg1-1) UNRELEASED; urgency=medium
   * New upstream snapshot
     - update copyright
     - now uses Opus for VoIP, drop Speex build-dependency
+  * Partially normalize packaging through wrap-and-sort
+    - the .install files are not entirely sorted to preserve the
+      relationship between comments and the files they refer to
 
  -- Simon McVittie <smcv at debian.org>  Fri, 22 Jan 2016 07:43:13 +0000
 
diff --git a/debian/control b/debian/control
index 02b4b88..a90101d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,19 @@ Source: ioquake3
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
-           Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 9),
-               dpkg-dev (>= 1.16.1),
-               libcurl4-gnutls-dev,
-               libjpeg-dev,
-               libopenal-dev,
-               libopus-dev,
-               libopusfile-dev,
-               libsdl2-dev (>= 2.0.0),
-               libvorbis-dev,
+Uploaders:
+ Bruno "Fuddl" Kleinert <fuddl at debian.org>,
+ Simon McVittie <smcv at debian.org>,
+Build-Depends:
+ debhelper (>= 9),
+ dpkg-dev (>= 1.16.1),
+ libcurl4-gnutls-dev,
+ libjpeg-dev,
+ libopenal-dev,
+ libopus-dev,
+ libopusfile-dev,
+ libsdl2-dev (>= 2.0.0),
+ libvorbis-dev,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/ioquake3.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/ioquake3.git
@@ -24,8 +26,10 @@ Depends:
  ioquake3-server (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
-Recommends: x11-utils | zenity | kdebase-bin
-Breaks: openarena (<< 0.8.8-9~)
+Recommends:
+ x11-utils | zenity | kdebase-bin,
+Breaks:
+ openarena (<< 0.8.8-9~),
 Description: Game engine for 3D first person shooter games
  This package installs a modified version of the ioQuake3 game engine,
  which can be used to play various games based on that engine, such as
@@ -34,12 +38,25 @@ Description: Game engine for 3D first person shooter games
  This package alone isn't of any use; to get a playable game, install
  openarena or another suitable set of game data.
 
+Package: ioquake3-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+ ioquake3-server (= ${binary:Version}),
+ ${misc:Depends},
+Description: debug symbols for the ioquake3 game engine
+ This package contains debug symbols for the ioQuake3 game engine,
+ which can be used to analyze crashes in games that use Debian's shared
+ ioquake engine.
+
 Package: ioquake3-server
 Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Breaks: openarena-server (<< 0.8.8-9~)
+Breaks:
+ openarena-server (<< 0.8.8-9~),
 Description: Engine for 3D first person shooter games - server and common files
  This package contains common files for the ioQuake3 game engine,
  which can be used to play various games based on that engine, such as
@@ -49,15 +66,3 @@ Description: Engine for 3D first person shooter games - server and common files
  This package alone isn't of any use; to get a playable game, install
  openarena or another suitable set of game data, or to get a usable server,
  install openarena-server or another suitable set of server data.
-
-Package: ioquake3-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
- ioquake3-server (= ${binary:Version}),
- ${misc:Depends},
-Description: debug symbols for the ioquake3 game engine
- This package contains debug symbols for the ioQuake3 game engine,
- which can be used to analyze crashes in games that use Debian's shared
- ioquake engine.
diff --git a/debian/copyright b/debian/copyright
index e56f108..3470c6b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -131,10 +131,10 @@ Copyright: © 1992 Stichting Mathematisch Centrum, Amsterdam, The Netherlands
 License: other-adpcm
                         All Rights Reserved
   .
-  Permission to use, copy, modify, and distribute this software and its 
-  documentation for any purpose and without fee is hereby granted, 
+  Permission to use, copy, modify, and distribute this software and its
+  documentation for any purpose and without fee is hereby granted,
   provided that the above copyright notice appear in all copies and that
-  both that copyright notice and this permission notice appear in 
+  both that copyright notice and this permission notice appear in
   supporting documentation, and that the names of Stichting Mathematisch
   Centrum or CWI not be used in advertising or publicity pertaining to
   distribution of the software without specific, written prior permission.
diff --git a/debian/ioquake3-server.install b/debian/ioquake3-server.install
index f04564e..d57c31b 100644
--- a/debian/ioquake3-server.install
+++ b/debian/ioquake3-server.install
@@ -1,10 +1,9 @@
-usr/lib/ioquake3/ioq3ded
+debian/q3arch usr/share/ioquake3
 usr/lib/ioquake3/*/qagame*.so
+usr/lib/ioquake3/ioq3ded
 
 # Symlinks for the full game, to be used by quake3.
 # The actual symlinks are made in debian/rules because the names vary;
 # we put them in this package instead of quake3 so that quake3 doesn't
 # have to be architecture-specific.
 usr/lib/quake3/*/*/qagame*.so
-
-debian/q3arch usr/share/ioquake3
diff --git a/debian/ioquake3.docs b/debian/ioquake3.docs
index 1911391..76f1e27 100644
--- a/debian/ioquake3.docs
+++ b/debian/ioquake3.docs
@@ -1,3 +1,3 @@
 build/README
-voip-readme.txt
 id-readme.txt
+voip-readme.txt
diff --git a/debian/ioquake3.install b/debian/ioquake3.install
index d22b762..fb28dbc 100644
--- a/debian/ioquake3.install
+++ b/debian/ioquake3.install
@@ -1,6 +1,6 @@
-usr/lib/ioquake3/ioquake3
 usr/lib/ioquake3/*/cgame*.so
 usr/lib/ioquake3/*/ui*.so
+usr/lib/ioquake3/ioquake3
 usr/lib/ioquake3/renderer*.so
 
 # Symlinks for the full game, to be used by quake3.

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

