[SCM] Packaging for vavoom branch, master, updated. debian/1.33-2-2-geeb715d

gustavo panizzo gfa gfa at zumbi.com.ar
Tue Mar 20 16:41:22 UTC 2012 

The following commit has been merged in the master branch:
commit dbc18c24323e977c9be995de325c923c3d94a13e
Author: gustavo panizzo gfa <gfa at zumbi.com.ar>
Date:   Tue Mar 20 13:40:47 2012 -0300

    Debian version 3

diff --git a/debian/changelog b/debian/changelog
index ec40ba4..f9a4d74 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).
+  * GNU/Hurd patch.
+
+ -- 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..a32ea8e 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 
+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.2
 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..5e52514 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,7 @@ Copyright:
 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 
+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
@@ -42,7 +42,7 @@ freely, subject to the following restrictions:
 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 
+source/fs_zip.cpp
 
 
 This program is free software; you can redistribute it and/or modify
@@ -111,5 +111,3 @@ 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.
-
-
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..99b4ad4
--- /dev/null
+++ b/debian/patches/fix-FTBFS-Hurd.patch
@@ -0,0 +1,36 @@
+Description: Fix FTBFS on GNU/Hurd 
+ simple fix for Hurd, this patch defines PATH_MAX, which is undefined on
+ GNU/Hurd.
+ .
+ vavoom (1.33-3) unstable; urgency=low
+ .
+   * libpng migration fixes (Closes: #662531).
+   * description updated (Closes: #662209).
+   * GNU/Hurd patch.
+Author: gustavo panizzo <gfa at zumbi.com.ar>
+Bug-Debian: http://bugs.debian.org/662209
+Bug-Debian: http://bugs.debian.org/662531
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+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.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