This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch quake
in repository game-data-packager.
commit a7b0e932c9131385b4b305c1a4b04a1aeda2bdcf
Author: Fabian Greffrath <fab...@greffrath.com>
Date: Mon Jan 13 12:29:26 2014 +0100
Sort Debian control files via "wrap-and-sort -ab"
---
debian/changelog | 7 +++++++
debian/control | 38 +++++++++++++++++++-------------------
debian/quake.install | 34 +++++++++++++++++-----------------
debian/quake2.install | 16 ++++++++--------
debian/quake3-server.install | 4 ++--
debian/quake3.install | 6 +++---
6 files changed, 56 insertions(+), 49 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 70aef09..f5b75b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quake (7) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Sort Debian control files via "wrap-and-sort -ab".
+
+ -- Fabian Greffrath <fabian+deb...@greffrath.com> Mon, 13 Jan 2014 12:28:29
+0100
+
quake (6) unstable; urgency=low
* Generate recoloured icons for Quake mission packs
diff --git a/debian/control b/debian/control
index 64a0485..04ad0f8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,9 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-games/quake.git
Package: quake
Architecture: all
-Depends: ${misc:Depends},
+Depends: quake-registered | quake-shareware | game-data-packager,
quakespasm | quake-engine,
- quake-registered | quake-shareware | game-data-packager
+ ${misc:Depends}
Recommends: x11-utils | zenity | kdebase-bin
Suggests: quake-armagon (>= 29),
quake-armagon-music,
@@ -39,11 +39,25 @@ Description: classic gothic/horror-themed first person
shooter
.
Creating quake-shareware requires the shareware version of Quake.
+Package: quake-server
+Architecture: all
+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.
+ .
+ To make this package useful, you will need to create and install the
+ non-distributable quake-registered or quake-shareware package, by using the
+ game-data-packager package.
+
Package: quake2
Architecture: all
-Depends: ${misc:Depends},
+Depends: quake2-full-data | quake2-demo-data | game-data-packager (>= 34),
yamagi-quake2 | quake2-engine,
- quake2-full-data | quake2-demo-data | game-data-packager (>= 34)
+ ${misc:Depends}
Suggests: quake2-music
Recommends: x11-utils | zenity | kdebase-bin
Description: classic science-fiction-themed first person shooter
@@ -56,25 +70,11 @@ Description: classic science-fiction-themed first person
shooter
either quake2-full-data or quake2-demo-data. Creating quake2-full-data
requires data files from a Quake II installation or CD-ROM.
-Package: quake-server
-Architecture: all
-Depends: adduser,
- quakespasm | quake-engine-server,
- quake-registered | quake-shareware | game-data-packager,
- ${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.
- .
- To make this package useful, you will need to create and install the
- non-distributable quake-registered or quake-shareware package, by using the
- game-data-packager package.
-
Package: quake2-server
Architecture: all
Depends: adduser,
- yamagi-quake2-core | quake2-engine-server,
quake2-full-data | quake2-demo-data | game-data-packager (>= 34),
+ yamagi-quake2-core | quake2-engine-server,
${misc:Depends}
Recommends: x11-utils | zenity | kdebase-bin
Description: dedicated server for Quake II
diff --git a/debian/quake.install b/debian/quake.install
index 9866429..307972f 100644
--- a/debian/quake.install
+++ b/debian/quake.install
@@ -1,22 +1,22 @@
-build/quake /usr/games
-need-data.sh /usr/share/games/quake
-quake.desktop /usr/share/applications
-quake-armagon.desktop /usr/share/applications
-quake-dissolution.desktop /usr/share/applications
-build/quake.xpm /usr/share/pixmaps
-build/256/quake.png /usr/share/icons/hicolor/256x256/apps
-build/256/quake.png /usr/share/icons/hicolor/256x256/apps
-build/48/quake.png /usr/share/icons/hicolor/48x48/apps
-build/32/quake.png /usr/share/icons/hicolor/32x32/apps
-build/24/quake.png /usr/share/icons/hicolor/24x24/apps
-build/22/quake.png /usr/share/icons/hicolor/22x22/apps
+build/16/quake-*.png /usr/share/icons/hicolor/16x16/apps
build/16/quake.png /usr/share/icons/hicolor/16x16/apps
-build/quake.svg /usr/share/icons/hicolor/scalable/apps
+build/22/quake-*.png /usr/share/icons/hicolor/22x22/apps
+build/22/quake.png /usr/share/icons/hicolor/22x22/apps
+build/24/quake-*.png /usr/share/icons/hicolor/24x24/apps
+build/24/quake.png /usr/share/icons/hicolor/24x24/apps
build/256/quake-*.png /usr/share/icons/hicolor/256x256/apps
build/256/quake-*.png /usr/share/icons/hicolor/256x256/apps
-build/48/quake-*.png /usr/share/icons/hicolor/48x48/apps
+build/256/quake.png /usr/share/icons/hicolor/256x256/apps
+build/256/quake.png /usr/share/icons/hicolor/256x256/apps
build/32/quake-*.png /usr/share/icons/hicolor/32x32/apps
-build/24/quake-*.png /usr/share/icons/hicolor/24x24/apps
-build/22/quake-*.png /usr/share/icons/hicolor/22x22/apps
-build/16/quake-*.png /usr/share/icons/hicolor/16x16/apps
+build/32/quake.png /usr/share/icons/hicolor/32x32/apps
+build/48/quake-*.png /usr/share/icons/hicolor/48x48/apps
+build/48/quake.png /usr/share/icons/hicolor/48x48/apps
+build/quake /usr/games
build/quake-*.svg /usr/share/icons/hicolor/scalable/apps
+build/quake.svg /usr/share/icons/hicolor/scalable/apps
+build/quake.xpm /usr/share/pixmaps
+need-data.sh /usr/share/games/quake
+quake-armagon.desktop /usr/share/applications
+quake-dissolution.desktop /usr/share/applications
+quake.desktop /usr/share/applications
diff --git a/debian/quake2.install b/debian/quake2.install
index f60b593..6536085 100644
--- a/debian/quake2.install
+++ b/debian/quake2.install
@@ -1,11 +1,11 @@
-build/quake2 /usr/games
-need-data.sh /usr/share/games/quake2
-quake2.desktop /usr/share/applications
-build/quake2.xpm /usr/share/pixmaps
+build/16/quake2.png /usr/share/icons/hicolor/16x16/apps
+build/22/quake2.png /usr/share/icons/hicolor/22x22/apps
+build/24/quake2.png /usr/share/icons/hicolor/24x24/apps
build/256/quake2.png /usr/share/icons/hicolor/256x256/apps
-build/48/quake2.png /usr/share/icons/hicolor/48x48/apps
build/32/quake2.png /usr/share/icons/hicolor/32x32/apps
-build/24/quake2.png /usr/share/icons/hicolor/24x24/apps
-build/22/quake2.png /usr/share/icons/hicolor/22x22/apps
-build/16/quake2.png /usr/share/icons/hicolor/16x16/apps
+build/48/quake2.png /usr/share/icons/hicolor/48x48/apps
+build/quake2 /usr/games
build/quake2.svg /usr/share/icons/hicolor/scalable/apps
+build/quake2.xpm /usr/share/pixmaps
+need-data.sh /usr/share/games/quake2
+quake2.desktop /usr/share/applications
diff --git a/debian/quake3-server.install b/debian/quake3-server.install
index 6f499a4..ae86946 100644
--- a/debian/quake3-server.install
+++ b/debian/quake3-server.install
@@ -1,3 +1,3 @@
-debian/q3/server.cfg etc/quake3-server
-build/quake3-server usr/games
README.quake3-data usr/share/doc/quake3-server
+build/quake3-server usr/games
+debian/q3/server.cfg etc/quake3-server
diff --git a/debian/quake3.install b/debian/quake3.install
index f040c85..e5b00ae 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -1,7 +1,7 @@
-quake3.desktop usr/share/applications
+README.quake3-data usr/share/games/quake3
+build/quake3 usr/games
build/quake3.png usr/share/pixmaps
build/quake3.xpm usr/share/pixmaps
build/quake332.xpm usr/share/pixmaps
-build/quake3 usr/games
need-data.sh usr/share/games/quake3
-README.quake3-data usr/share/games/quake3
+quake3.desktop usr/share/applications
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
