[scorched3d] 02/39: wrap-and-sort -sab.
Markus Koschany
apo at moszumanska.debian.org
Sat Jul 16 03:28:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository scorched3d.
commit 802f1efd65fb9201cb4029c2fa69922e86914f48
Author: Markus Koschany <apo at debian.org>
Date: Fri Jul 15 16:54:34 2016 +0200
wrap-and-sort -sab.
---
debian/control | 71 +++++++++++++++++++++++++-------------------
debian/copyright | 2 +-
debian/scorched3d-data.links | 2 +-
debian/scorched3d.dirs | 3 +-
debian/scorched3d.install | 2 +-
5 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index 433c518..b5c90b5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,33 @@ Source: scorched3d
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>,
- Bruno "Fuddl" Kleinert <fuddl at debian.org>,
- Stephen M. Webb <stephen.webb at bregmasoft.ca>,
- Phil Morrell <debian at emorrp1.name>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- gawk,
- libalut-dev,
- libexpat1-dev,
- libfftw3-dev,
- libfreetype6-dev,
- libgl1-mesa-dev,
- libglew-dev,
- libglu1-mesa-dev,
- libjpeg-dev,
- libogg-dev,
- libopenal-dev,
- libpng-dev,
- libsdl-net1.2-dev,
- libsdl1.2-dev,
- libvorbis-dev,
- libwxgtk3.0-dev,
- pkg-config
-Build-Conflicts: nvidia-glx
+Uploaders:
+ Reinhard Tartler <siretart at tauware.de>,
+ Bruno "Fuddl" Kleinert <fuddl at debian.org>,
+ Stephen M. Webb <stephen.webb at bregmasoft.ca>,
+ Phil Morrell <debian at emorrp1.name>
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ gawk,
+ libalut-dev,
+ libexpat1-dev,
+ libfftw3-dev,
+ libfreetype6-dev,
+ libgl1-mesa-dev,
+ libglew-dev,
+ libglu1-mesa-dev,
+ libjpeg-dev,
+ libogg-dev,
+ libopenal-dev,
+ libpng-dev,
+ libsdl-net1.2-dev,
+ libsdl1.2-dev,
+ libvorbis-dev,
+ libwxgtk3.0-dev,
+ pkg-config
+Build-Conflicts:
+ nvidia-glx
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-games/scorched3d.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/scorched3d.git
@@ -33,10 +36,12 @@ Homepage: http://scorched3d.sourceforge.net/
Package: scorched3d
Architecture: any
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: scorched3d-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Pre-Depends:
+ dpkg (>= 1.15.6~)
+Depends:
+ scorched3d-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: 3D artillery game similar to Scorched Earth
Scorched3D is a game based heavily on the classic DOS game Scorched Earth
"The Mother Of All Games". Scorched3D adds amongst other new features
@@ -44,9 +49,13 @@ Description: 3D artillery game similar to Scorched Earth
Package: scorched3d-data
Architecture: all
-Suggests: scorched3d
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: fonts-dejavu, ${misc:Depends}
+Suggests:
+ scorched3d
+Pre-Depends:
+ dpkg (>= 1.15.6~)
+Depends:
+ fonts-dejavu,
+ ${misc:Depends}
Description: data files for Scorched3D game
Scorched3D is a game based heavily on the classic DOS game Scorched Earth
"The Mother Of All Games". Scorched3D adds amongst other new features
diff --git a/debian/copyright b/debian/copyright
index 771ddd9..ca27d71 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,7 +21,7 @@ Copyright:
© 2006-2011 Bruno "Fuddl" Kleinert <fuddl at debian.org>
© 2011-2012 Stephen M. Webb <stephen.webb at bregmasoft.ca>
© 2013-2014 Juhani Numminen <juhaninumminen0 at gmail.com>
- © 2014 Olly Betts <olly at survex.com>
+ © 2014 Olly Betts <olly at survex.com>
© 2016 Tobias Frost <tobi at debian.org>
© 2016 Phil Morrell <debian at emorrp1.name>
License: GPL-2+
diff --git a/debian/scorched3d-data.links b/debian/scorched3d-data.links
index 51aeef2..a3b3710 100644
--- a/debian/scorched3d-data.links
+++ b/debian/scorched3d-data.links
@@ -1,3 +1,3 @@
/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf /usr/share/games/scorched3d/data/fonts/dejavusans.ttf
-/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf /usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
/usr/share/fonts/truetype/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/games/scorched3d/data/fonts/dejavusconbd.ttf
+/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf /usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
diff --git a/debian/scorched3d.dirs b/debian/scorched3d.dirs
index 2f4291f..67b59cf 100644
--- a/debian/scorched3d.dirs
+++ b/debian/scorched3d.dirs
@@ -1,5 +1,4 @@
usr/games
-usr/share/icons/hicolor/48x48/apps
usr/share/applications
+usr/share/icons/hicolor/48x48/apps
usr/share/pixmaps
-
diff --git a/debian/scorched3d.install b/debian/scorched3d.install
index 9bf043b..1a6b608 100644
--- a/debian/scorched3d.install
+++ b/debian/scorched3d.install
@@ -1,7 +1,7 @@
usr/games/scorched3d
usr/games/scorched3dc
usr/games/scorched3ds
-usr/share/bug/scorched3d/presubj
usr/share/applications/scorched3d.desktop
+usr/share/bug/scorched3d/presubj
usr/share/icons/hicolor/48x48/apps/scorched3d.png
usr/share/pixmaps/scorched3d.xpm
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scorched3d.git
More information about the Pkg-games-commits
mailing list