[SCM] Packaging for vavoom branch, master, updated. debian/1.33-2-1-gc5a16fe
gustavo panizzo gfa
gfa at zumbi.com.ar
Wed Mar 21 03:31:51 UTC 2012
The following commit has been merged in the master branch:
commit c5a16fe24cb018f2e32841df84549ce39969943f
Author: gustavo panizzo gfa <gfa at zumbi.com.ar>
Date: Wed Mar 21 00:30:56 2012 -0300
Debian release 1.33-3
diff --git a/debian/changelog b/debian/changelog
index ec40ba4..350909d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vavoom (1.33-3) unstable; urgency=low
+
+ * libpng migration fixes (Closes: #662531).
+ * description updated (Closes: #662209).
+ * Fix FTBFS on GNU/Hurd.
+
+ -- gustavo panizzo <gfa at zumbi.com.ar> Thu, 08 Mar 2012 23:40:50 -0300
+
vavoom (1.33-2) unstable; urgency=low
* FreeDoom support on vlaunch, and better support
diff --git a/debian/control b/debian/control
index 874d70b..5e22fe9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,31 @@ Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: gustavo panizzo <gfa at zumbi.com.ar>, Jon Dowland <jmtd at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), cmake, zlib1g-dev, libpng12-dev, libvorbis-dev, libmad0-dev, libmikmod2-dev, libflac++-dev, liballegro4.2-dev, libsdl-mixer1.2-dev, libwxgtk2.8-dev
-Standards-Version: 3.9.2
+Build-Depends:
+ cmake,
+ debhelper (>= 7.0.50~),
+ liballegro4.2-dev,
+ libflac++-dev,
+ libmad0-dev,
+ libmikmod2-dev,
+ libpng-dev,
+ libsdl-mixer1.2-dev,
+ libvorbis-dev,
+ libwxgtk2.8-dev,
+ zlib1g-dev
+Standards-Version: 3.9.3
Homepage: http://www.vavoom-engine.com/
-
Package: vavoom
Provides: doom-engine, heretic-engine
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: freedoom | doom-wad | heretic-wad | game-data-packager | boom-wad
Description: Advanced Doom/Heretic/Hexen/Strife engine
- Vavoom is a engine based on sources of Doom, Heretic, Hexen and
+ Vavoom is an engine based on sources of Doom, Heretic, Hexen and
a little bit from Quake.
- Vavoom needs game data to run, A free game date is available in
- freedoom package. Commercial game data could be packaged using
- game-data-packager
- One of Vavoom's features is it's graphical launcher (vlaunch)
+ It needs game data to run, A free game data is available in
+ freedoom package. Commercial game data can be packaged using
+ game-data-packager.
+ .
+ Vavoom features vlaunch, a graphical launcher.
diff --git a/debian/copyright b/debian/copyright
index f7737cd..896dd9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,115 +1,73 @@
-This work was packaged for Debian by:
-
- gustavo panizzo <gfa at zumbi.com.ar> on Thu, 16 Sep 2010 00:41:09 -0300
-
-It was downloaded from:
-
- <http://www.vavoom-engine.com>
-
-Upstream Author:
-
- <Janis Legzdinsh vavoom at vavoom-engine.com>
-
-Copyright:
-
- Copyright © 2010 Janis Legzdinsh
- Copyright © 2008 Raven Software (Heretic & Hexen)
- Copyright © 2006 Randy Heit (ZDoom)
- Copyright © 2004 Gilles Vollant (zlib)
- Copyright © 1999 Id Software, Bernd Kreimeier (Doom)
- Copyright © 1999 Id Software (Quake)
-
-
-License:
-
-The following files are distributed under the zlib license
-utils/vlumpy/zip.cpp, utils/vlumpy/zip.h, utils/vlumpy/ioapi.h utils/vlumpy/ioapi.cpp
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-The following files are distributed under the zlib (above) and GPL licenses
-source/fs_zip.cpp
-
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-
-
-The following files are distributed under the BSD and GPL licenses
-progs/common/linespec/ActorMover.vc
-progs/common/linespec/AimingCamera.vc
-progs/common/linespec/InterpolationPoint.vc
-progs/common/linespec/InterpolationSpecial.vc
-progs/common/linespec/LookAtCamera.vc
-progs/common/linespec/ParticleFountain.vc
-progs/common/linespec/PathFollower.vc
-progs/common/linespec/SecurityCamera.vc
-progs/common/linespec/SoundSequence.vc
-
-//** Copyright 1998-2006 Randy Heit
-//** All rights reserved.
-//**
-//** Redistribution and use in source and binary forms, with or without
-//** modification, are permitted provided that the following conditions
-//** are met:
-//**
-//** 1. Redistributions of source code must retain the above copyright
-//** notice, this list of conditions and the following disclaimer.
-//** 2. Redistributions in binary form must reproduce the above copyright
-//** notice, this list of conditions and the following disclaimer in the
-//** documentation and/or other materials provided with the distribution.
-//** 3. The name of the author may not be used to endorse or promote products
-//** derived from this software without specific prior written permission.
-//**
-//** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-//** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-//** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-//** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-//** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-//** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-//** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-//** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//**
-//**************************************************************************
-
-
-The Debian packaging is:
-
- Copyright © 2011 gustavo panizzo <gfa at zumbi.com.ar>
-
-you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: VAVOOM
+Upstream-Contact: Janis Legzdinsh <vavoom at vavoom-engine.com>
+Source: http://vavoom-engine.com/
+
+Files: progs/common/linespec/ActorMover.vc progs/common/linespec/AimingCamera.vc progs/common/linespec/InterpolationPoint.vc progs/common/linespec/InterpolationSpecial.vc progs/common/linespec/LookAtCamera.vc progs/common/linespec/ParticleFountain.vc progs/common/linespec/PathFollower.vc progs/common/linespec/SecurityCamera.vc progs/common/linespec/SoundSequence.vc
+Copyright: 1998-2006 Randy Heit
+ 1999-2006 Janis Legzdinsh
+License: BSD-3-clause and GPL-2+
+
+License: BSD-3-clause
+ All rights reserved
+ .
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following
+ conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+Files: *
+Copyright: 1990-2012 Janis Legzdinsh
+License: GPL-2+
+
+Files: source/fs_zip.cpp
+Copyright: 1999-2006 Janis Legzdinsh
+License: GPL-2+ or Zlib
+
+Files: utils/vlumpy/*
+Copyright: 1999-2006 Janis Legzdinsh
+License: Zlib
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: debian/*
+Copyright: 2010-2012 gustavo panizzo
+License: GPL-2+
+
+License: GPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index 8a9041e..0ceedee 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -1,18 +1,8 @@
Description: debianization of vavoom pkg
- only change the path here
-
- .
- vavoom (1.33-1) unstable; urgency=low
- .
- * Initial release (Closes: #598406).
- .
+ this patch only changes install time paths.
Author: gustavo panizzo <gfa at zumbi.com.ar>
Bug-Debian: http://bugs.debian.org/598406
-
----
-
-Bug-Debian: http://bugs.debian.org/598406
-Last-Update: <2011-10-02>
+Last-Update: 2011-10-02
--- vavoom-1.33.orig/source/CMakeLists.txt
+++ vavoom-1.33/source/CMakeLists.txt
diff --git a/debian/patches/fix-FTBFS-Hurd.patch b/debian/patches/fix-FTBFS-Hurd.patch
new file mode 100644
index 0000000..141d17d
--- /dev/null
+++ b/debian/patches/fix-FTBFS-Hurd.patch
@@ -0,0 +1,22 @@
+Description: Fix FTBFS on GNU/Hurd
+ simple fix for Hurd, this patch defines PATH_MAX, which is undefined on
+ GNU/Hurd.
+Author: gustavo panizzo <gfa at zumbi.com.ar>
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-03-19
+
+--- vavoom-1.33.orig/utils/acc/token.h
++++ vavoom-1.33/utils/acc/token.h
+@@ -15,6 +15,11 @@
+
+ // MACROS ------------------------------------------------------------------
+
++// Define PATH_MAX for systems that don't have it, like Hurd
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ // TYPES -------------------------------------------------------------------
+
+ typedef enum
diff --git a/debian/patches/freedoom-support.patch b/debian/patches/freedoom-support.patch
index f5c0a11..4a148ec 100644
--- a/debian/patches/freedoom-support.patch
+++ b/debian/patches/freedoom-support.patch
@@ -1,20 +1,9 @@
Description: FreeDoom enablement for Vavoom.
this patch allows to run freedoom on vavoom with a single parameter
- -freedoom
it also allows to save games on a dedicated directory instead of sharing with doom 2.
- .
- vavoom (1.33-2) unstable; urgency=low
- .
- * FreeDoom support on vlaunch, and better support in general (Closes: #661233).
- * Menu entry added. thanks Pabs (Closes: #661232).
Author: gustavo panizzo <gfa at zumbi.com.ar>
Bug-Debian: http://bugs.debian.org/661233
-
----
-
-Author: gustavo panizzo <gfa at zumbi.com.ar>
-Bug-Debian: http://bugs.debian.org/661233
-Last-Update: <2012-02-28>
+Last-Update: 2012-02-28
--- vavoom-1.33.orig/basev/CMakeLists.txt
+++ vavoom-1.33/basev/CMakeLists.txt
diff --git a/debian/patches/freedoom-vlaunch.patch b/debian/patches/freedoom-vlaunch.patch
index 3018762..85659cf 100644
--- a/debian/patches/freedoom-vlaunch.patch
+++ b/debian/patches/freedoom-vlaunch.patch
@@ -1,21 +1,8 @@
-Description: Add FreeDoom to vlaunch menu.
- this patch just add one more game to vlaunch's
- list of games.
- .
- vavoom (1.33-2) unstable; urgency=low
- .
- * FreeDoom support on vlaunch, and better support
- in general (Closes: #661233).
- * Menu entry added. thanks Pabs (Closes: #661232).
- * Standards version bumped to 3.9.2
+Description: Add FreeDoom to vlaunch menu
+ this patch adds freedoom to vlaunch's menu.
Author: gustavo panizzo <gfa at zumbi.com.ar>
Bug-Debian: http://bugs.debian.org/661233
-
----
-
-Author: gustavo panizzo <gfa at zumbi.com.ar>
-Bug-Debian: http://bugs.debian.org/661233
-Last-Update: <2012-02-28>
+Last-Update: 2012-02-28
--- vavoom-1.33.orig/utils/vlaunch/vlaunch.cpp
+++ vavoom-1.33/utils/vlaunch/vlaunch.cpp
diff --git a/debian/patches/series b/debian/patches/series
index 2d08f38..d6bc083 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian-paths.patch
spelling-fixes
freedoom-support.patch
freedoom-vlaunch.patch
+fix-FTBFS-Hurd.patch
diff --git a/debian/patches/spelling-fixes b/debian/patches/spelling-fixes
index 4e8d85e..a7ca726 100644
--- a/debian/patches/spelling-fixes
+++ b/debian/patches/spelling-fixes
@@ -1,14 +1,7 @@
-Description: spelling fixes on vavoom source
- .
- vavoom (1.33-1) unstable; urgency=low
- .
- * Initial release (Closes: #598406).
- .
+Description: spelling fixes on vavoom source.
Author: gustavo panizzo <gfa at zumbi.com.ar>
Bug-Debian: http://bugs.debian.org/598406
-
----
-Last-Update: <2012-02-17>
+Last-Update: 2012-02-17
--- vavoom-1.33.orig/source/vc_property.cpp
+++ vavoom-1.33/source/vc_property.cpp
diff --git a/debian/vavoom-dedicated.6 b/debian/vavoom-dedicated.6
deleted file mode 100644
index 106b0d6..0000000
--- a/debian/vavoom-dedicated.6
+++ /dev/null
@@ -1,133 +0,0 @@
-.TH vavoom 6 games
-.SS NAME
-vavoom \- The most advanced Doom/Heretic/Hexen/Strife source port around!
-.SH SYNOPSIS
-.B vavoom
-[ \-opengl ] [ \-d3d ] [ \-particles \fIn\fR ] [ \-surfcachesize \fIn\fR ] [ \-nosound ] [ \-no3dsound ] [ \-nomusic ] [ \-cddev \fIfile\fR ] [ \-openal ] [ \-nomouse ] [ \-nojoy ] [ \-nolan ] [ \-noudp ] [ \-ip \fIip_addr\fR ] [ \-noipx ] [ \-mpath ] [ \-port \fIn\fR ] { [ \-freedoom] | [ \-doom ] | [ \-doom2 ] | [ \-tnt ] | [ \-plutonia ] | [ \-heretic ] | [ \-hexen ] | [ \-strife ] } [ \-game \fIdirectory\fR ] [ \-devgame \fIdirectory\fR ] [ \-devsnd \fIsndinfo_script\fR ] [ \-progs \fIdirectory\fP ]
-
-.SH DESCRIPTION
-
-.B Vavoom
-is a source port based on sources of Doom, Heretic, Hexen and
-a little bit from Quake. Supported platforms are Windows and Linux.
-Vavoom has a graphical launcher (vlaunch).
-
-.SH Graphic Options
-.TP
-.BI \-opengl
-selects OpenGL driver
-.TP
-.BI \-d3d
-selects Direct3D driver
-.TP
-.BI \-particles\ <count>
-specifies number of particles to use, default is 2048, but you can't have less than 512 (i.e. you can't disable them)
-.TP
-.BI \-surfcachesize\ <size>
-specifies size of surface cache memory, in kilobytes
-.SH Sound Options
-.TP
-.BI \-nosound
-disables all sound, music and CD-Audio
-.TP
-.BI \-nosfx
-disables sound
-.TP
-.BI \-no3dsound
-disables 3D sound, use original mode, Windows version only
-.TP
-.BI \-nomusic
-disables music
-.TP
-.BI \-nocdaudio
-disables CD music
-.TP
-.BI \-cddev\ <file>
-specifies CD device \fIfile\fP, default /dev/cdrom, LINUX version only
-.TP
-.BI \-openal
-enabled OpenAL driver.
-.SH Input Options
-.BI \-nomouse
-disables mouse
-.TP
-.BI \-nojoy
-disables joystick
-.SH Network Options
-.BI \-nolan
-disables all LAN drivers
-.TP
-.BI \-noudp
-disables TCP/IP driver
-.TP
-.BI \-ip\ <address>
-specifies IP address, Windows version only
-.TP
-.BI \-noipx
-disables IPX driver
-.TP
-.BI \-mpath
-enables MPATH TCP/IP driver, DOS version only
-.TP
-.BI \-port\ <port>
-sets default LAN port
-.SH Game selection
-.BI \-freedoom
-look only for FreeDoom IWAD files
-.TP
-.BI \-doom
-look only for Doom IWAD files
-.TP
-.BI \-doom2
-look only for Doom 2: Hell On Earth IWAD files
-.TP
-.BI \-tnt
-look only for Doom TNT: Evilution IWAD files
-.TP
-.BI \-plutonia
-look only for Doom: The Plutionia Experiment IWAD files
-.TP
-.BI \-heretic
-look only for Heretic IWAD files
-.TP
-.BI \-hexen
-look only for Hexen IWAD files
-.TP
-.BI \-strife
-look only for Strife IWAD files
-.SH Custom games and development
-.BI \-game\ <directory>
-specifies custom game.
-.TP
-.BI \-devgame\ <directory>
-like \fI-game\fR, but also sets Vavoom in development mode.
-.TP
-.BI \-devsound\ <SNDINFO_script>
-sets sound development mode, uses given SNDINFO script, sounds and music are loaded form archive \fIdirectory\fP, which is specified in script.
-.TP
-.BI \-progs\ <directory>
-specifies \fIdirectory\fP where to look for progs. Server progs are loaded from \fIfile\fP svprogs.dat, client progs - clprogs.dat. Path must include ending slash.
- Example: \-progs progs/myprogs/
-.TP
-.BI \-file\ <file1> [<file2> \.\.\.]
-specifies additional files.
-.TP
-.BI \-iwaddir\ <dir1> [<dir2> \.\.\.]
-specifies additional directories where to look for IWAD files.
-.SH Debugging Options
-.BI \-debug
-creates a debug \fIfile\fP basev/debug.txt with all console messages.
-.TP
-.BI \-starttime\ <time>
-sets start time, not in LINUX version and dedicated servers
-.TP
-.BI \-rhide
-prints debugfile to stderr, in DOS version Sys_Error exits with call frame traceback
-.SH More Information
-http://vavoom-engine.com/wiki/index.php?title=Command_line_arguments
-
-/usr/share/doc/vavoom/vavoom.txt.gz
-.PP
-Doom is a registered trademark of id software (http://www.idsoftware.com/).
-.SH Author
-See the copyright file on \fI/usr/share/doc/vavoom/copyright\fR
diff --git a/debian/vavoom.link b/debian/vavoom.link
new file mode 100644
index 0000000..468c847
--- /dev/null
+++ b/debian/vavoom.link
@@ -0,0 +1 @@
+usr/share/man/man6/vavoom.6 usr/share/man/man6/vavoom-dedicated.6
diff --git a/debian/vavoom.manpages b/debian/vavoom.manpages
index 0ab5f91..1259d85 100644
--- a/debian/vavoom.manpages
+++ b/debian/vavoom.manpages
@@ -1,2 +1 @@
debian/vavoom.6
-debian/vavoom-dedicated.6
diff --git a/debian/watch b/debian/watch
index 34277bc..a834c09 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://sf.net/vavoom/vavoom-(.*)\.tar\.gz
+http://sf.net/vavoom/vavoom-(.+)\.(?:tar\.(?:gz|bz2|xz))
--
Packaging for vavoom
More information about the Pkg-games-commits
mailing list