[iortcw] 01/01: Normalize packaging via wrap-and-sort -abst

Simon McVittie smcv at debian.org
Sun Jul 17 20:07:02 UTC 2016


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

smcv pushed a commit to branch master
in repository iortcw.

commit 460a48d70d4511648ccd700664e5adb6832f56ac
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jul 17 20:52:06 2016 +0100

    Normalize packaging via wrap-and-sort -abst
---
 debian/changelog           |  6 ++++
 debian/control             | 79 ++++++++++++++++++++++++----------------------
 debian/rtcw-common.install |  2 +-
 debian/rtcw-server.install |  2 +-
 debian/rtcw.install        | 12 +++----
 debian/rtcw.manpages       |  2 +-
 6 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f655ea..4bf6a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+iortcw (1.42d+dfsg1-4) UNRELEASED; urgency=medium
+
+  * Normalize packaging via wrap-and-sort -abst
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 17 Jul 2016 20:50:57 +0100
+
 iortcw (1.42d+dfsg1-3) unstable; urgency=medium
 
   * Standards-Version: 3.9.8 (no changes required)
diff --git a/debian/control b/debian/control
index d62b965..a8642fc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,22 @@ Source: iortcw
 Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 9),
-               dh-apparmor [linux-any],
-               dh-systemd,
-               dpkg-dev (>= 1.16.1),
-               libcurl4-gnutls-dev,
-               libfreetype6-dev,
-               libjpeg-dev,
-               libopenal-dev,
-               libopus-dev,
-               libopusfile-dev,
-               libsdl2-dev (>= 2.0.0),
-               libspeexdsp-dev,
-               libvorbis-dev,
+Uploaders:
+ Simon McVittie <smcv at debian.org>,
+Build-Depends:
+ debhelper (>= 9),
+ dh-apparmor [linux-any],
+ dh-systemd,
+ dpkg-dev (>= 1.16.1),
+ libcurl4-gnutls-dev,
+ libfreetype6-dev,
+ libjpeg-dev,
+ libopenal-dev,
+ libopus-dev,
+ libopusfile-dev,
+ libsdl2-dev (>= 2.0.0),
+ libspeexdsp-dev,
+ libvorbis-dev,
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/iortcw.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/iortcw.git
@@ -24,10 +26,11 @@ Homepage: https://github.com/iortcw/iortcw/
 Package: rtcw
 Architecture: any
 Depends:
+ rtcw-common (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
- rtcw-common (= ${binary:Version}),
-Recommends: x11-utils | zenity | kde-baseapps-bin
+Recommends:
+ x11-utils | zenity | kde-baseapps-bin,
 Description: game engine for Return to Castle Wolfenstein
  Return to Castle Wolfenstein is a military- and occult-themed first-person
  shooter game in a Second World War setting, originally released in 2001.
@@ -44,33 +47,12 @@ Description: game engine for Return to Castle Wolfenstein
  Return to Castle Wolfenstein requires non-distributable game data files
  in the rtcw-data package, prepared using the game-data-packager tool.
 
-Package: rtcw-server
-Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- adduser,
- rtcw-common (= ${binary:Version}),
-Description: standalone server for Return to Castle Wolfenstein
- Return to Castle Wolfenstein is a military- and occult-themed first-person
- shooter game in a Second World War setting, originally released in 2001.
- It is a sequel to Wolfenstein 3D, which is also available for Debian
- (in the wolf4sdl package).
- .
- This package contains the iortcw dedicated server for multiplayer,
- based on ioquake3 and the GPL source releases of RTCW. It also contains
- the init script and systemd unit to start the RTCW server, with support
- for multiple server instances under systemd.
- .
- Return to Castle Wolfenstein requires non-distributable game data files
- from the rtcw-data package, prepared using the game-data-packager tool.
-
 Package: rtcw-common
 Architecture: any
 Depends:
+ rtcw-data (>= 1.42b+40) | game-data-packager (>= 40),
  ${misc:Depends},
  ${shlibs:Depends},
- rtcw-data (>= 1.42b+40) | game-data-packager (>= 40),
 Description: common files for Return to Castle Wolfenstein
  Return to Castle Wolfenstein is a military- and occult-themed first-person
  shooter game in a Second World War setting, originally released in 2001.
@@ -91,3 +73,24 @@ Depends:
 Description: debug symbols for the iortcw game engine
  This package contains debug symbols for the iortcw game engine,
  which can be used to analyze crashes in Return to Castle Wolfenstein.
+
+Package: rtcw-server
+Architecture: any
+Depends:
+ adduser,
+ rtcw-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: standalone server for Return to Castle Wolfenstein
+ Return to Castle Wolfenstein is a military- and occult-themed first-person
+ shooter game in a Second World War setting, originally released in 2001.
+ It is a sequel to Wolfenstein 3D, which is also available for Debian
+ (in the wolf4sdl package).
+ .
+ This package contains the iortcw dedicated server for multiplayer,
+ based on ioquake3 and the GPL source releases of RTCW. It also contains
+ the init script and systemd unit to start the RTCW server, with support
+ for multiple server instances under systemd.
+ .
+ Return to Castle Wolfenstein requires non-distributable game data files
+ from the rtcw-data package, prepared using the game-data-packager tool.
diff --git a/debian/rtcw-common.install b/debian/rtcw-common.install
index 4e2a190..502f8df 100644
--- a/debian/rtcw-common.install
+++ b/debian/rtcw-common.install
@@ -1,2 +1,2 @@
-debian/build/mp/main/*.so              usr/lib/rtcw/main
 debian/README.rtcw-data                usr/lib/rtcw
+debian/build/mp/main/*.so              usr/lib/rtcw/main
diff --git a/debian/rtcw-server.install b/debian/rtcw-server.install
index d998056..1e84b89 100644
--- a/debian/rtcw-server.install
+++ b/debian/rtcw-server.install
@@ -1,6 +1,6 @@
 debian/apparmor.d/usr.lib.rtcw.iowolfded etc/apparmor.d
 debian/build/mp/iowolfded              usr/lib/rtcw
 debian/build/mp/iowolfded.*            usr/lib/rtcw
-debian/scripts/wolfded                 usr/games
 debian/rtcw-server at .service            lib/systemd/system
+debian/scripts/wolfded                 usr/games
 debian/server.cfg                      etc/rtcw-server
diff --git a/debian/rtcw.install b/debian/rtcw.install
index 431030e..c511b51 100644
--- a/debian/rtcw.install
+++ b/debian/rtcw.install
@@ -1,21 +1,21 @@
 # Single player
 debian/build/sp/iowolfsp*              usr/lib/rtcw
 debian/build/sp/iowolfsp.*             usr/lib/rtcw
-debian/build/sp/renderer*.so           usr/lib/rtcw
 debian/build/sp/main/*.so              usr/lib/rtcw/main
-debian/wolfsp.desktop                  usr/share/applications
+debian/build/sp/renderer*.so           usr/lib/rtcw
 debian/scripts/wolfsp                  usr/games
+debian/wolfsp.desktop                  usr/share/applications
 
 # Multiplayer client
 debian/build/mp/iowolfmp*              usr/lib/rtcw
 debian/build/mp/iowolfmp.*             usr/lib/rtcw
 debian/build/mp/renderer*.so           usr/lib/rtcw
-debian/wolfmp.desktop                  usr/share/applications
 debian/scripts/wolfmp                  usr/games
+debian/wolfmp.desktop                  usr/share/applications
 
 # Shared between clients
-debian/apparmor.d/usr.lib.rtcw         etc/apparmor.d
-debian/need-data.sh                    usr/lib/rtcw
+debian/*.svg                           usr/share/icons/hicolor/scalable/apps
 debian/32/*.png                        usr/share/icons/hicolor/32x32/apps
 debian/48/*.png                        usr/share/icons/hicolor/48x48/apps
-debian/*.svg                           usr/share/icons/hicolor/scalable/apps
+debian/apparmor.d/usr.lib.rtcw         etc/apparmor.d
+debian/need-data.sh                    usr/lib/rtcw
diff --git a/debian/rtcw.manpages b/debian/rtcw.manpages
index ae85723..d01a448 100644
--- a/debian/rtcw.manpages
+++ b/debian/rtcw.manpages
@@ -1,2 +1,2 @@
-debian/wolfsp.6
 debian/wolfmp.6
+debian/wolfsp.6

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



More information about the Pkg-games-commits mailing list