[SCM] Packaging for vavoom branch, master, updated. debian/1.33-2-1-g7006d23
gustavo panizzo gfa
gfa at zumbi.com.ar
Mon Jun 11 00:59:27 UTC 2012
The following commit has been merged in the master branch:
commit 7006d23b525aef2595d1ebdb65f879f41fc40ffb
Author: gustavo panizzo gfa <gfa at zumbi.com.ar>
Date: Sun Jun 10 21:59:08 2012 -0300
updated to 1.33-3
diff --git a/debian/changelog b/debian/changelog
index ec40ba4..e188290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+vavoom (1.33-3) unstable; urgency=low
+
+ * libpng migration fixes (Closes: #662531).
+ * Description updated (Closes: #662209).
+ * Fix FTBFS on GNU/Hurd.
+ * Add libjpeg-dev to Build-Deps (Closes: #674339).
+ * entries rectified with wrap-and-sort.
+ * copyright file updated to comply with machine-readable format, version 1.0.
+ * patches standarized to DEP-3.
+ * enable hardening build.
+ * symlink manpages to save some space.
+ * vcs: lines in control to point at git repository.
+ * added manpage for vlaunch
+
+ -- gustavo panizzo <gfa at zumbi.com.ar> Thu, 05 Jun 2012 14:20: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..85f9a73 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,33 @@ 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,
+ libjpeg8-dev,
+ zlib1g-dev
+Standards-Version: 3.9.3
Homepage: http://www.vavoom-engine.com/
-
+Vcs-Browser: http://anonscm.debian.org/git/pkg-games/vavoom.git
+Vcs-Git: git://anonscm.debian.org/pkg-games/vavoom.git
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..fd42e40 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,115 +1,71 @@
-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 <gfa at zumbi.com.ar>
+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/fix-hardening b/debian/patches/fix-hardening
new file mode 100644
index 0000000..96f9987
--- /dev/null
+++ b/debian/patches/fix-hardening
@@ -0,0 +1,57 @@
+Description: patches to enable hardening on vavoom
+ simple fixes to enable hardened build
+Author: gustavo panizzo <gfa at zumbi.com.ar>
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-05-28
+
+--- vavoom-1.33.orig/utils/vcc/vcc.cpp
++++ vavoom-1.33/utils/vcc/vcc.cpp
+@@ -122,7 +122,7 @@ int main(int argc, char **argv)
+ }
+ catch (VException& e)
+ {
+- FatalError(e.What());
++ FatalError("%s", e.What());
+ }
+ return 0;
+ }
+
+--- vavoom-1.33.orig/source/misc.cpp
++++ vavoom-1.33/source/misc.cpp
+@@ -119,7 +119,7 @@ void FOutputDevice::Logf(EName Type, con
+
+ void VLogSysError::Serialise(const char* V, EName)
+ {
+- Sys_Error(V);
++ Sys_Error("%s", V);
+ }
+
+ //==========================================================================
+@@ -130,7 +130,7 @@ void VLogSysError::Serialise(const char*
+
+ void VLogHostError::Serialise(const char* V, EName)
+ {
+- Host_Error(V);
++ Host_Error("%s", V);
+ }
+
+ //==========================================================================
+
+--- vavoom-1.33.orig/source/vc_object.cpp
++++ vavoom-1.33/source/vc_object.cpp
+@@ -477,12 +477,12 @@ IMPLEMENT_FUNCTION(VObject, IsDestroyed)
+
+ IMPLEMENT_FUNCTION(VObject, Error)
+ {
+- Host_Error(*PF_FormatString());
++ Host_Error("%s", *PF_FormatString());
+ }
+
+ IMPLEMENT_FUNCTION(VObject, FatalError)
+ {
+- Sys_Error(*PF_FormatString());
++ Sys_Error("%s", *PF_FormatString());
+ }
+
+ //**************************************************************************
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..e3730ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ debian-paths.patch
spelling-fixes
freedoom-support.patch
freedoom-vlaunch.patch
+fix-FTBFS-Hurd.patch
+fix-hardening
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/rules b/debian/rules
index 8e22b83..dcf4a3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,16 @@
#!/usr/bin/make -f
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+
+export CPPFLAGS
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
+
%:
dh --buildsystem=cmake $@
@@ -20,3 +31,8 @@ override_dh_install:
install -d debian/vavoom/usr/share/applications
mv debian/vavoom.desktop debian/vavoom/usr/share/applications/
+#override_dh_link:
+# dh_link debian/vavoom/usr/share/man/man6/vavoom.6 debian/vavoom/usr/share/man/man6/vavoom-dedicated.6
+# ln -s debian/vavoom/usr/share/man/man6/vavoom.6 debian/vavoom/usr/share/man/man6/vavoom-dedicated.6
+# ls debian/vavoom/usr/share/man/man6
+# ls usr/share/man/man6
diff --git a/debian/vavoom.links b/debian/vavoom.links
new file mode 100644
index 0000000..468c847
--- /dev/null
+++ b/debian/vavoom.links
@@ -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..8341c66 100644
--- a/debian/vavoom.manpages
+++ b/debian/vavoom.manpages
@@ -1,2 +1,2 @@
debian/vavoom.6
-debian/vavoom-dedicated.6
+debian/vlaunch.6
diff --git a/debian/vlaunch.6 b/debian/vlaunch.6
new file mode 100644
index 0000000..7541935
--- /dev/null
+++ b/debian/vlaunch.6
@@ -0,0 +1,30 @@
+.TH vlaunch 6 games
+.SS NAME
+vavoom \- The most advanced Doom/Heretic/Hexen/Strife source port around!
+.SH SYNOPSIS
+.B vlaunch
+[ \--help | \-h ] [ \--verbose ]
+
+.SH DESCRIPTION
+
+.B vlaunch
+vlaunch is the graphical launcher for Vavoom
+
+.SH OPTIONS
+.TP
+.BI \--help, -h
+shows a help message.
+.TP
+.BI \--verbose
+generates verbose log messages.
+
+.SH More Information
+
+.TP
+ /usr/share/doc/vavoom/vavoom.txt.gz
+.TP
+ man (6) vavoom
+
+.SH Author
+.TP
+See the copyright file on \fI/usr/share/doc/vavoom/copyright\fR
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