r15849 - in packages/trunk/stormbaancoureur/debian: . patches source
Markus Koschany
apo at moszumanska.debian.org
Wed Aug 3 18:42:00 UTC 2016
Author: apo
Date: 2016-08-03 18:41:59 +0000 (Wed, 03 Aug 2016)
New Revision: 15849
Added:
packages/trunk/stormbaancoureur/debian/source/
packages/trunk/stormbaancoureur/debian/source/format
packages/trunk/stormbaancoureur/debian/stormbaancoureur.manpages
Removed:
packages/trunk/stormbaancoureur/debian/README.source
Modified:
packages/trunk/stormbaancoureur/debian/README.Debian
packages/trunk/stormbaancoureur/debian/changelog
packages/trunk/stormbaancoureur/debian/compat
packages/trunk/stormbaancoureur/debian/control
packages/trunk/stormbaancoureur/debian/copyright
packages/trunk/stormbaancoureur/debian/docs
packages/trunk/stormbaancoureur/debian/patches/fullscreen_optional.patch
packages/trunk/stormbaancoureur/debian/patches/makefile.patch
packages/trunk/stormbaancoureur/debian/rules
packages/trunk/stormbaancoureur/debian/stormbaancoureur.6
packages/trunk/stormbaancoureur/debian/stormbaancoureur.desktop
packages/trunk/stormbaancoureur/debian/stormbaancoureur.install
Log:
Release stormbaancoureur 2.1.6-2
Modified: packages/trunk/stormbaancoureur/debian/README.Debian
===================================================================
--- packages/trunk/stormbaancoureur/debian/README.Debian 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/README.Debian 2016-08-03 18:41:59 UTC (rev 15849)
@@ -6,7 +6,7 @@
on two notes.
First, it turned out that Sturmbahn is not a German word. The WWII rank
- refered to a Bann, not a Bahn.
+ referred to a Bann, not a Bahn.
Second, the bad taste pun turned out to be more offensive than intended.
Many have voiced concerns about the bad taste, so from version 1.5 onwards
Deleted: packages/trunk/stormbaancoureur/debian/README.source
===================================================================
--- packages/trunk/stormbaancoureur/debian/README.source 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/README.source 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,6 +0,0 @@
-This package uses quilt to manage all modifications to the upstream source.
-The fully patched source can be generated using the patch target provided by
-`debian/rules'.
-
-If you want to know more about how to use quilt to manage Debian patches, read
-/usr/share/doc/quilt/README.source.
Modified: packages/trunk/stormbaancoureur/debian/changelog
===================================================================
--- packages/trunk/stormbaancoureur/debian/changelog 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/changelog 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,13 +1,41 @@
-stormbaancoureur (2.1.6-2) UNRELEASED; urgency=low
+stormbaancoureur (2.1.6-2) unstable; urgency=medium
+ * Team upload.
+
[ Paul Wise ]
- * Install example configuration file (Closes: #592520)
+ * Install example configuration file (Closes: #592520, #807444)
[ Evgeni Golov ]
- * Correct Vcs-* URLs to point to anonscm.debian.org
+ * Correct Vcs-* URLs to point to anonscm.debian.org.
- -- Paul Wise <pabs at debian.org> Sun, 29 Aug 2010 12:18:15 +0800
+ [ Markus Koschany ]
+ * Switch to source format 3.0. Remove quilt from Build-Depends and drop
+ README.source because source format 3.0 uses quilt by default.
+ * Build-Depend simply on libode-dev.
+ * wrap-and-sort -sab.
+ * Use compat level 9 and require debhelper >= 9.
+ * Declare compliance with Debian Policy 3.9.8.
+ * Use secure SVN URL.
+ * stormbaancoureur-data: Suggest stormbaancoureur.
+ * Simplify debian/rules by using dh sequencer and provide build-{arch,indep}
+ targets. Fix FTBFS when building with dpkg-buildpackage -A.
+ (Closes: #822026, #806874)
+ * stormbaancoureur.desktop: Add keywords and a comment in German.
+ * Update makefile.patch to use correct MULTIARCH directories and use all
+ hardening build flags.
+ * debian/rules: Export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed.
+ -- Markus Koschany <apo at debian.org> Wed, 03 Aug 2016 19:38:05 +0200
+
+stormbaancoureur (2.1.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove remaining hard coded libode paths from Makefile including
+ a prerequisite on a system installed library with wrong path
+ (Closes: #804840)
+
+ -- Andreas Bombe <aeb at debian.org> Sun, 22 Nov 2015 18:38:09 +0100
+
stormbaancoureur (2.1.6-1) unstable; urgency=low
[ Barry deFreese ]
@@ -33,7 +61,7 @@
[ Gonéri Le Bouder ]
* Add plib-dev as an alternative to libplib-dev
- * Merge makefile_cflags.patch and makefile_libode.patch in
+ * Merge makefile_cflags.patch and makefile_libode.patch in
makefile.patch
* change makefile so it calls ode-config to get the correct
gcc parameter for ODE (-I/usr/include -DdDOUBLE)
@@ -66,7 +94,7 @@
[ Vincent Fourmond ]
* Tighten up build-deps to make sure we don't use broken plib (which
certainly closes: #486866)
- * Make lintian a little happier about long lines in copyright
+ * Make lintian a little happier about long lines in copyright
* Add a README.source file, which makes it comply to standards 3.8.0
* urgency=high because it fixes a RC bug in testing
Modified: packages/trunk/stormbaancoureur/debian/compat
===================================================================
--- packages/trunk/stormbaancoureur/debian/compat 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/compat 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/stormbaancoureur/debian/control
===================================================================
--- packages/trunk/stormbaancoureur/debian/control 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/control 2016-08-03 18:41:59 UTC (rev 15849)
@@ -4,18 +4,24 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
Miriam Ruiz <little_miry at yahoo.es>,
- Barry deFreese <bdefreese at debian.org>,
-Build-Depends: debhelper (>= 5.0.51), quilt,
- plib1.8.4-dev | libplib-dev, libode-dev (>=2:0.10.1) | libode0-dev |
- libode-nonfree0-dev, freeglut3-dev, libasound2-dev
-Standards-Version: 3.8.3
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ freeglut3-dev,
+ libasound2-dev,
+ libode-dev,
+ plib1.8.4-dev | libplib-dev
+Standards-Version: 3.9.8
Homepage: http://www.stolk.org/stormbaancoureur/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/stormbaancoureur/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/stormbaancoureur/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/stormbaancoureur/
Package: stormbaancoureur
Architecture: any
-Depends: stormbaancoureur-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ stormbaancoureur-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: simulated obstacle course for automobiles
Your objective is to drive your car along an obstacle course. Success depends
on total control of the car. If you want to master it, try to have the laws
@@ -25,7 +31,9 @@
Package: stormbaancoureur-data
Architecture: all
-Depends: ${misc:Depends}
-Recommends: stormbaancoureur
+Depends:
+ ${misc:Depends}
+Suggests:
+ stormbaancoureur
Description: game data for Stormbaan Coureur
Models, images, sounds and other data for Stormbaan Coureur.
Modified: packages/trunk/stormbaancoureur/debian/copyright
===================================================================
--- packages/trunk/stormbaancoureur/debian/copyright 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/copyright 2016-08-03 18:41:59 UTC (rev 15849)
@@ -2,13 +2,13 @@
Fri, 01 Jun 2007 21:27:50 +0000.
Tarball downloaded from: http://bram.creative4vision.nl/stormbaancoureur/download/stormbaancoureur-2.1.5.tar.gz
-Web page for downloads:
+Web page for downloads:
http://bram.creative4vision.nl/stormbaancoureur/download/
Previous web page: http://www.sturmbahnfahrer.com/
Upstream Author: Bram Stolk <b.stolk at gmail.com>
-Copyright:
+Copyright:
Copyright (C) 2006-2008 Bram Stolk
@@ -17,7 +17,7 @@
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3 as
published by the Free Software Foundation.
-
+
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
Modified: packages/trunk/stormbaancoureur/debian/docs
===================================================================
--- packages/trunk/stormbaancoureur/debian/docs 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/docs 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1 +1 @@
-./src-stormbaancoureur/README
+src-stormbaancoureur/README
Modified: packages/trunk/stormbaancoureur/debian/patches/fullscreen_optional.patch
===================================================================
--- packages/trunk/stormbaancoureur/debian/patches/fullscreen_optional.patch 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/patches/fullscreen_optional.patch 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,8 +1,17 @@
-Index: stormbaancoureur-2.1.4/src-stormbaancoureur/main.cxx
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 3 Aug 2016 19:52:04 +0200
+Subject: fullscreen_optional
+
===================================================================
---- stormbaancoureur-2.1.4.orig/src-stormbaancoureur/main.cxx 2008-04-20 15:58:29.000000000 +0000
-+++ stormbaancoureur-2.1.4/src-stormbaancoureur/main.cxx 2008-06-11 11:40:54.000000000 +0000
-@@ -836,6 +836,13 @@
+---
+ src-stormbaancoureur/main.cxx | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/src-stormbaancoureur/main.cxx b/src-stormbaancoureur/main.cxx
+index f7a8142..e5ae5f8 100644
+--- a/src-stormbaancoureur/main.cxx
++++ b/src-stormbaancoureur/main.cxx
+@@ -836,6 +836,13 @@ int main(int argc, char *argv[])
fprintf(stderr,"plib is (c) by Steve Baker\n");
fprintf(stderr,"OpenDE is (c) by Russel L. Smith\n");
@@ -16,7 +25,7 @@
char *bindirname = dirname(argv[0]);
if (!strcmp(bindirname,"."))
dirprefix="/usr/share/games/stormbaancoureur";
-@@ -874,10 +881,9 @@
+@@ -874,10 +881,9 @@ int main(int argc, char *argv[])
glutMotionFunc(motion);
glutIdleFunc(idle);
@@ -30,7 +39,7 @@
{
int width = glutGameModeGet( GLUT_GAME_MODE_WIDTH );
int height = glutGameModeGet( GLUT_GAME_MODE_HEIGHT );
-@@ -886,7 +892,6 @@
+@@ -886,7 +892,6 @@ int main(int argc, char *argv[])
fprintf(stderr,"%dx%d-%d@%d\n", width, height, pixelDepth, refreshRate);
//glutEnterGameMode();
}
Modified: packages/trunk/stormbaancoureur/debian/patches/makefile.patch
===================================================================
--- packages/trunk/stormbaancoureur/debian/patches/makefile.patch 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/patches/makefile.patch 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,17 +1,27 @@
-Index: stormbaancoureur-2.1.6/src-stormbaancoureur/Makefile
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 3 Aug 2016 19:52:04 +0200
+Subject: makefile
+
===================================================================
---- stormbaancoureur-2.1.6.orig/src-stormbaancoureur/Makefile 2009-12-03 19:59:57.000000000 -0500
-+++ stormbaancoureur-2.1.6/src-stormbaancoureur/Makefile 2009-12-03 20:00:06.000000000 -0500
-@@ -8,6 +8,8 @@
+---
+ src-stormbaancoureur/Makefile | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src-stormbaancoureur/Makefile b/src-stormbaancoureur/Makefile
+index 1b040a6..e934718 100644
+--- a/src-stormbaancoureur/Makefile
++++ b/src-stormbaancoureur/Makefile
+@@ -7,6 +7,9 @@ PLIBPREFIX=/usr
+ ODEPREFIX=/usr
CXX=g++
LIBDIRNAME=lib
++ARCHITECTURE ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
++
++CFLAGS=-02 -g -Wall
-+CFLAGS=-02 -g -Wall
-+
# END OF CUSTOM SETTINGS
- CXXFLAGS=\
-@@ -17,11 +19,13 @@
+@@ -17,11 +20,14 @@ CXXFLAGS=\
-I../src-common \
-I. \
-DGAMEVERSION=$(VERSION) \
@@ -23,11 +33,12 @@
-L$(PLIBPREFIX)/$(LIBDIRNAME) \
- -L/usr/X11R6/$(LIBDIRNAME)
+ -L/usr/X11R6/$(LIBDIRNAME) \
-+ `ode-config --libs`
++ `ode-config --libs` \
++ $(LDFLAGS)
OBJS=\
-@@ -39,7 +43,7 @@
+@@ -39,7 +45,7 @@ OBJS=\
LIBS=\
@@ -36,3 +47,12 @@
-lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
-lglut -lGLU -lGL -lasound
+@@ -47,7 +53,7 @@ LIBS=\
+ all: stormbaancoureur
+
+
+-stormbaancoureur: $(OBJS) $(ODEPREFIX)/$(LIBDIRNAME)/libode.a
++stormbaancoureur: $(OBJS) $(ODEPREFIX)/$(LIBDIRNAME)/$(ARCHITECTURE)/libode.a
+ $(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS)
+
+ staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
Modified: packages/trunk/stormbaancoureur/debian/rules
===================================================================
--- packages/trunk/stormbaancoureur/debian/rules 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/rules 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,77 +1,23 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+%:
+ dh $@ --parallel
-patch:
- dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-unpatch:
- dh_testdir
- QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
+override_dh_auto_build:
+ $(MAKE) -C src-stormbaancoureur CFLAGS="$(CPPFLAGS) $(CFLAGS)"
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
- touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- $(MAKE) -C src-stormbaancoureur CFLAGS="$(CFLAGS)"
- #docbook-to-man debian/stormbaancoureur.sgml > stormbaancoureur.1
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+override_dh_auto_clean:
[ ! -f src-stormbaancoureur/Makefile ] || $(MAKE) -C src-stormbaancoureur clean
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean
+ dh_auto_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install:
$(MAKE) install -C src-stormbaancoureur DESTDIR=$(CURDIR)/debian/tmp
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman debian/stormbaancoureur.6
- dh_icons
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Added: packages/trunk/stormbaancoureur/debian/source/format
===================================================================
--- packages/trunk/stormbaancoureur/debian/source/format (rev 0)
+++ packages/trunk/stormbaancoureur/debian/source/format 2016-08-03 18:41:59 UTC (rev 15849)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/trunk/stormbaancoureur/debian/stormbaancoureur.6
===================================================================
--- packages/trunk/stormbaancoureur/debian/stormbaancoureur.6 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/stormbaancoureur.6 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,15 +1,15 @@
.\" (c) 2007 Miriam Ruiz <little_miry at yahoo.es>
-.\"
+.\"
.\" This document 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 package; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -26,36 +26,36 @@
.P
The X Window System specific options parsed by glutInit are as follows:
-.TP
+.TP
\-display DISPLAY
Specify the X server to connect to. If not specified, the value of the DISPLAY environment variable is used.
-.TP
+.TP
.B \-geometry W x H + X + Y
Determines where window's should be created on the screen. The parameter following \-geometry should be formatted as a standard X geometry specification. The effect of using this option is to change the GLUT initial size and initial position the same as if glutInitWindowSize or glutInitWindowPosition were called directly.
-.TP
+.TP
.B \-iconic
Requests all top\-level windows be created in an iconic state.
-.TP
+.TP
.B \-indirect
Force the use of indirect OpenGL rendering contexts.
-.TP
+.TP
.B \-direct
Force the use of direct OpenGL rendering contexts (not all GLX implementations support direct rendering contexts). A fatal error is generated if direct rendering is not supported by the OpenGL implementation.
If neither \-indirect or \-direct are used to force a particular behavior, GLUT will attempt to use direct rendering if possible and otherwise fallback to indirect rendering.
-.TP
+.TP
.B \-gldebug
After processing callbacks and/or events, check if there are any OpenGL errors by calling glGetError. If an error is reported, print out a warning by looking up the error code with gluErrorString. Using this option is helpful in detecting OpenGL run\-time errors.
-.TP
+.TP
.B \-sync
Enable synchronous X protocol transactions. This option makes it easier to track down potential X protocol errors.
.P
Debian\-specific options:
-.TP
+.TP
.B \-fullscreen
Run the game in fullscreen mode
-.TP
+.TP
.B \-window
Run the game inside a window
.SH "SEE ALSO"
Modified: packages/trunk/stormbaancoureur/debian/stormbaancoureur.desktop
===================================================================
--- packages/trunk/stormbaancoureur/debian/stormbaancoureur.desktop 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/stormbaancoureur.desktop 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,8 +1,10 @@
[Desktop Entry]
Name=Stormbaan Coureur
Comment=simulated obstacle course for automobiles
+Comment[de]=simulierter Hinderniskurs für Automobile
Exec=stormbaancoureur
Icon=stormbaancoureur
Terminal=false
Type=Application
Categories=Game;ActionGame;
+Keywords=car;automobile;obstacle;course;
Modified: packages/trunk/stormbaancoureur/debian/stormbaancoureur.install
===================================================================
--- packages/trunk/stormbaancoureur/debian/stormbaancoureur.install 2016-07-16 19:06:59 UTC (rev 15848)
+++ packages/trunk/stormbaancoureur/debian/stormbaancoureur.install 2016-08-03 18:41:59 UTC (rev 15849)
@@ -1,3 +1,3 @@
+debian/*.desktop usr/share/applications/
+debian/*.xpm usr/share/pixmaps/
debian/tmp/usr/games/* usr/games/
-debian/*.xpm usr/share/pixmaps/
-debian/*.desktop usr/share/applications/
Added: packages/trunk/stormbaancoureur/debian/stormbaancoureur.manpages
===================================================================
--- packages/trunk/stormbaancoureur/debian/stormbaancoureur.manpages (rev 0)
+++ packages/trunk/stormbaancoureur/debian/stormbaancoureur.manpages 2016-08-03 18:41:59 UTC (rev 15849)
@@ -0,0 +1 @@
+debian/stormbaancoureur.6
More information about the Pkg-games-commits
mailing list