[quake] 02/02: Normalize packaging via wrap-and-sort -abst
Simon McVittie
smcv at debian.org
Wed Mar 2 10:32:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository quake.
commit caa6c738c90deb0bf1107c41408415e6f1b1c707
Author: Simon McVittie <smcv at debian.org>
Date: Wed Mar 2 10:30:48 2016 +0000
Normalize packaging via wrap-and-sort -abst
---
debian/changelog | 1 +
debian/control | 196 +++++++++++++++++++++++--------------------
debian/etqw.install | 6 +-
debian/quake-server.install | 2 +-
debian/quake2-server.links | 3 +-
debian/quake3-server.links | 13 ++-
debian/quake3.install | 6 +-
debian/quake4-server.install | 2 +-
debian/quake4.install | 8 +-
9 files changed, 123 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b3a154b..f99e0a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ quake (17) UNRELEASED; urgency=medium
* quake4*: add experimental AppArmor profiles
* Switch Vcs-Git to https (see #810378)
* Standards-Version: 3.9.7 (no further changes needed)
+ * Normalize packaging via wrap-and-sort -abst
-- Simon McVittie <smcv at debian.org> Thu, 10 Dec 2015 00:44:21 +0100
diff --git a/debian/control b/debian/control
index 09faf50..662285f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
Source: quake
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: David Banks <amoebae at gmail.com>,
- Simon McVittie <smcv at debian.org>,
- Jack Coulter <jscinoz at gmail.com>
+Uploaders:
+ David Banks <amoebae at gmail.com>,
+ Simon McVittie <smcv at debian.org>,
+ Jack Coulter <jscinoz at gmail.com>,
Section: contrib/games
Priority: optional
Build-Depends:
@@ -17,17 +18,75 @@ Standards-Version: 3.9.7
Vcs-Git: https://anonscm.debian.org/git/pkg-games/quake.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/quake.git
+Package: etqw
+Architecture: i386
+Depends:
+ etqw-bin | game-data-packager (>= 44),
+ x11-utils | zenity | kde-baseapps-bin,
+ ${misc:Depends},
+Suggests:
+ etqw-pb-bin,
+Description: science-fiction-themed multiplayer first person shooter
+ Enemy Territory: Quake Wars is a multiplayer first-person shooter game
+ by Splash Damage and id Software, released in 2007.
+ This package contains a launcher script and menu entry to play
+ ETQW using the proprietary x86 binaries provided by id Software.
+ .
+ Please note that the ETQW engine is not Free Software, and Debian
+ cannot fix any bugs or security flaws in the engine or game code.
+ .
+ To make this package useful, you will need to create and install some
+ non-distributable packages by using the game-data-packager package:
+ etqw-bin, and etqw-data.
+ Creating those packages requires data files from an "Enemy Territory:
+ Quake Wars" installation or DVD.
+
+Package: etqw-server
+Architecture: i386
+Depends:
+ adduser,
+ etqw-bin | game-data-packager (>= 44),
+ etqw-data | game-data-packager (>= 44),
+ ${misc:Depends},
+Recommends:
+ systemd-sysv,
+Suggests:
+ etqw-pb-bin,
+Description: dedicated server for Enemy Territory: Quake Wars
+ This package contains a launcher script and systemd unit to run a
+ Enemy Territory: Quake Wars server using the proprietary
+ x86 binaries provided by id Software.
+ .
+ Please note that the ETQW engine is not Free Software, and Debian
+ cannot fix any bugs or security flaws in the engine or game code.
+ .
+ To mitigate any security flaws that might exist in this server,
+ the systemd unit is not enabled by default, and must be enabled
+ with systemctl if it should start at boot time. The systemd unit
+ uses various security hardening options to prevent the server from
+ escalating its privileges. There is no sysvinit script,
+ since sysvinit does not provide similar security hardening.
+ .
+ To make this package useful, you will need to create and install some
+ non-distributable packages by using the game-data-packager package:
+ etqw-bin, and etqw-data.
+ Creating those packages requires data files from an "Enemy Territory:
+ Quake Wars" installation or DVD.
+
Package: quake
Architecture: all
-Depends: quake-registered | quake-shareware | game-data-packager,
- quakespasm | quake-engine,
- ${misc:Depends}
-Recommends: x11-utils | zenity | kde-baseapps-bin
-Suggests: quake-armagon (>= 29),
- quake-armagon-music,
- quake-dissolution (>= 29),
- quake-dissolution-music,
- quake-music
+Depends:
+ quake-registered | quake-shareware | game-data-packager,
+ quakespasm | quake-engine,
+ ${misc:Depends},
+Recommends:
+ x11-utils | zenity | kde-baseapps-bin,
+Suggests:
+ quake-armagon (>= 29),
+ quake-armagon-music,
+ quake-dissolution (>= 29),
+ quake-dissolution-music,
+ quake-music,
Description: classic gothic/horror-themed first person shooter
Quake is a classic first-person shooter game by id Software,
released in 1996. This package contains a launcher script and menu
@@ -49,10 +108,11 @@ Description: classic gothic/horror-themed first person shooter
Package: quake-server
Architecture: all
-Depends: adduser,
- quake-registered | quake-shareware | game-data-packager,
- quakespasm | quake-engine-server,
- ${misc:Depends}
+Depends:
+ adduser,
+ quake-registered | quake-shareware | game-data-packager,
+ quakespasm | quake-engine-server,
+ ${misc:Depends},
Description: classic first person shooter - server and init script
This package contains a launcher script and init script to run a
Quake 1 server automatically, with any suitable engine.
@@ -63,13 +123,14 @@ Description: classic first person shooter - server and init script
Package: quake2
Architecture: all
-Depends: quake2-full-data | quake2-demo-data | game-data-packager (>= 34),
- yamagi-quake2 | quake2-engine,
- ${misc:Depends}
+Depends:
+ quake2-full-data | quake2-demo-data | game-data-packager (>= 34),
+ yamagi-quake2 | quake2-engine,
+ ${misc:Depends},
Suggests:
+ quake2-groundzero,
quake2-music,
quake2-reckoning,
- quake2-groundzero,
Recommends:
game-data-packager (>= 39),
x11-utils | zenity | kde-baseapps-bin,
@@ -90,13 +151,14 @@ Description: classic science-fiction-themed first person shooter
Package: quake2-server
Architecture: all
-Depends: adduser,
- quake2-full-data | quake2-demo-data | game-data-packager (>= 34),
- yamagi-quake2-core | quake2-engine-server,
- ${misc:Depends}
+Depends:
+ adduser,
+ quake2-full-data | quake2-demo-data | game-data-packager (>= 34),
+ yamagi-quake2-core | quake2-engine-server,
+ ${misc:Depends},
Suggests:
- quake2-reckoning-data,
quake2-groundzero-data,
+ quake2-reckoning-data,
Description: dedicated server for Quake II
This package contains a launcher script and init script to run a
Quake II server automatically, with any suitable engine.
@@ -108,11 +170,14 @@ Description: dedicated server for Quake II
Package: quake3
Architecture: all
-Depends: ioquake3,
- quake3-data | quake3-demo-data (>= 40) | game-data-packager (>= 23),
- ${misc:Depends}
-Suggests: quake3-team-arena-data
-Recommends: x11-utils | zenity | kde-baseapps-bin
+Depends:
+ ioquake3,
+ quake3-data | quake3-demo-data (>= 40) | game-data-packager (>= 23),
+ ${misc:Depends},
+Suggests:
+ quake3-team-arena-data,
+Recommends:
+ x11-utils | zenity | kde-baseapps-bin,
Description: Quake III Arena menu entry and launcher scripts
This package contains a launcher script and menu entry to play
Quake III Arena or Quake III: Team Arena with the ioquake3 engine.
@@ -131,13 +196,15 @@ Description: Quake III Arena menu entry and launcher scripts
Package: quake3-server
Architecture: all
-Depends: adduser,
- ioquake3-server,
- quake3-data | game-data-packager (>= 23),
- ${misc:Depends}
+Depends:
+ adduser,
+ ioquake3-server,
+ quake3-data | game-data-packager (>= 23),
+ ${misc:Depends},
Recommends:
game-data-packager (>= 39),
-Suggests: quake3-team-arena-data
+Suggests:
+ quake3-team-arena-data,
Description: Quake III Arena dedicated server launcher scripts
This package contains a launcher script to run a Quake III Arena or
Quake III: Team Arena dedicated server with the ioquake3 engine.
@@ -149,9 +216,9 @@ Description: Quake III Arena dedicated server launcher scripts
Package: quake4
Architecture: i386
Depends:
- ${misc:Depends},
quake4-bin | game-data-packager (>= 43),
x11-utils | zenity | kde-baseapps-bin,
+ ${misc:Depends},
Description: science-fiction-themed first person shooter
Quake 4 is a first-person shooter game by Raven Software and id Software,
released in 2005. This package contains a launcher script and menu
@@ -171,10 +238,10 @@ Description: science-fiction-themed first person shooter
Package: quake4-server
Architecture: i386
Depends:
- ${misc:Depends},
adduser,
quake4-bin | game-data-packager (>= 43),
quake4-data | quake4-censored-de-data | game-data-packager (>= 43),
+ ${misc:Depends},
Recommends:
systemd-sysv,
Description: dedicated server for Quake 4
@@ -198,58 +265,3 @@ Description: dedicated server for Quake 4
quake4-censored-de-data (for the incompatible version sold in Germany).
Creating those packages requires data files from a Quake 4 installation
or DVD.
-
-Package: etqw
-Architecture: i386
-Depends:
- ${misc:Depends},
- etqw-bin | game-data-packager (>= 44),
- x11-utils | zenity | kde-baseapps-bin,
-Suggests:
- etqw-pb-bin,
-Description: science-fiction-themed multiplayer first person shooter
- Enemy Territory: Quake Wars is a multiplayer first-person shooter game
- by Splash Damage and id Software, released in 2007.
- This package contains a launcher script and menu entry to play
- ETQW using the proprietary x86 binaries provided by id Software.
- .
- Please note that the ETQW engine is not Free Software, and Debian
- cannot fix any bugs or security flaws in the engine or game code.
- .
- To make this package useful, you will need to create and install some
- non-distributable packages by using the game-data-packager package:
- etqw-bin, and etqw-data.
- Creating those packages requires data files from an "Enemy Territory:
- Quake Wars" installation or DVD.
-
-Package: etqw-server
-Architecture: i386
-Depends:
- ${misc:Depends},
- adduser,
- etqw-bin | game-data-packager (>= 44),
- etqw-data | game-data-packager (>= 44),
-Recommends:
- systemd-sysv,
-Suggests:
- etqw-pb-bin,
-Description: dedicated server for Enemy Territory: Quake Wars
- This package contains a launcher script and systemd unit to run a
- Enemy Territory: Quake Wars server using the proprietary
- x86 binaries provided by id Software.
- .
- Please note that the ETQW engine is not Free Software, and Debian
- cannot fix any bugs or security flaws in the engine or game code.
- .
- To mitigate any security flaws that might exist in this server,
- the systemd unit is not enabled by default, and must be enabled
- with systemctl if it should start at boot time. The systemd unit
- uses various security hardening options to prevent the server from
- escalating its privileges. There is no sysvinit script,
- since sysvinit does not provide similar security hardening.
- .
- To make this package useful, you will need to create and install some
- non-distributable packages by using the game-data-packager package:
- etqw-bin, and etqw-data.
- Creating those packages requires data files from an "Enemy Territory:
- Quake Wars" installation or DVD.
diff --git a/debian/etqw.install b/debian/etqw.install
index dde2faa..efa4a0e 100644
--- a/debian/etqw.install
+++ b/debian/etqw.install
@@ -1,6 +1,6 @@
-build/etqw usr/games
-build/README.etqw-bin usr/lib/etqw
README.etqw-data usr/lib/etqw
-need-data.sh usr/lib/etqw
+build/README.etqw-bin usr/lib/etqw
+build/etqw usr/games
confirm-binary-only.sh usr/lib/etqw
etqw.desktop usr/share/applications
+need-data.sh usr/lib/etqw
diff --git a/debian/quake-server.install b/debian/quake-server.install
index e2f7583..909ef36 100644
--- a/debian/quake-server.install
+++ b/debian/quake-server.install
@@ -1,3 +1,3 @@
build/quake-server /usr/games
-debian/server.cfg /etc/quake-server
debian/quake-server at .service lib/systemd/system
+debian/server.cfg /etc/quake-server
diff --git a/debian/quake2-server.links b/debian/quake2-server.links
index c8fe0d8..d031dd8 100644
--- a/debian/quake2-server.links
+++ b/debian/quake2-server.links
@@ -1,5 +1,4 @@
+etc/quake2-server usr/share/games/quake2-demo/baseq2/etc/quake2-server
etc/quake2-server usr/share/games/quake2/baseq2/etc/quake2-server
etc/quake2-server/debian_server.cfg usr/share/games/quake2/baseq2/debian_server.cfg
-
-etc/quake2-server usr/share/games/quake2-demo/baseq2/etc/quake2-server
etc/quake2-server/demo/debian_server.cfg usr/share/games/quake2-demo/baseq2/debian_server.cfg
diff --git a/debian/quake3-server.links b/debian/quake3-server.links
index c4749cd..39f8435 100644
--- a/debian/quake3-server.links
+++ b/debian/quake3-server.links
@@ -1,11 +1,8 @@
-etc/quake3-server usr/share/games/quake3/baseq3/etc/quake3-server
-etc/quake3-server/server.cfg usr/share/games/quake3/baseq3/debian_server.cfg
-
+# deliberately no symlink into usr/lib/quake3/demo, it probably isn't
+# network-compatible with anything
etc/quake3-server usr/lib/quake3/base/baseq3/etc/quake3-server
-etc/quake3-server/server.cfg usr/lib/quake3/base/baseq3/debian_server.cfg
-
etc/quake3-server usr/lib/quake3/ta/baseq3/etc/quake3-server
+etc/quake3-server usr/share/games/quake3/baseq3/etc/quake3-server
+etc/quake3-server/server.cfg usr/lib/quake3/base/baseq3/debian_server.cfg
etc/quake3-server/server.cfg usr/lib/quake3/ta/baseq3/debian_server.cfg
-
-# deliberately no symlink into usr/lib/quake3/demo, it probably isn't
-# network-compatible with anything
+etc/quake3-server/server.cfg usr/share/games/quake3/baseq3/debian_server.cfg
diff --git a/debian/quake3.install b/debian/quake3.install
index c61f758..33f0b1e 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -1,8 +1,8 @@
README.quake3-data usr/share/games/quake3
+build/48/quake3-teamarena.png usr/share/icons/hicolor/48x48/apps
+build/48/quake3.png usr/share/icons/hicolor/48x48/apps
build/quake3 usr/games
-build/quake3.png usr/share/icons/hicolor/256x256/apps
build/quake3-teamarena.png usr/share/icons/hicolor/256x256/apps
-build/48/quake3.png usr/share/icons/hicolor/48x48/apps
-build/48/quake3-teamarena.png usr/share/icons/hicolor/48x48/apps
+build/quake3.png usr/share/icons/hicolor/256x256/apps
need-data.sh usr/share/games/quake3
quake3*.desktop usr/share/applications
diff --git a/debian/quake4-server.install b/debian/quake4-server.install
index b185375..5283dd7 100644
--- a/debian/quake4-server.install
+++ b/debian/quake4-server.install
@@ -1,4 +1,4 @@
README.quake4-data usr/share/doc/quake4-server
build/quake4-dedicated usr/games
-debian/q4/server.cfg etc/quake4-server
debian/apparmor.d/usr.lib.quake4.q4ded.x86 etc/apparmor.d
+debian/q4/server.cfg etc/quake4-server
diff --git a/debian/quake4.install b/debian/quake4.install
index 7d86e05..f999b73 100644
--- a/debian/quake4.install
+++ b/debian/quake4.install
@@ -1,14 +1,14 @@
+README.quake4-data usr/lib/quake4
build/16/quake4*.png usr/share/icons/hicolor/16x16/apps
build/22/quake4*.png usr/share/icons/hicolor/22x22/apps
build/24/quake4*.png usr/share/icons/hicolor/24x24/apps
build/256/quake4*.png usr/share/icons/hicolor/256x256/apps
build/32/quake4*.png usr/share/icons/hicolor/32x32/apps
build/48/quake4*.png usr/share/icons/hicolor/48x48/apps
+build/README.quake4-bin usr/lib/quake4
build/quake4 usr/games
build/quake4*.svg usr/share/icons/hicolor/scalable/apps
-build/README.quake4-bin usr/lib/quake4
-README.quake4-data usr/lib/quake4
-need-data.sh usr/lib/quake4
confirm-binary-only.sh usr/lib/quake4
-quake4.desktop usr/share/applications
debian/apparmor.d/usr.lib.quake4.quake4.x86 etc/apparmor.d
+need-data.sh usr/lib/quake4
+quake4.desktop usr/share/applications
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git
More information about the Pkg-games-commits
mailing list