[trigger-rally] 33/103: * new upstream version * cleaned up patches, which are no longer necessary * cleaned up README.Debian (the old url is no longer) * updated location of orig.tar.gz via svn-property.
Bertrand Marc
bbk-guest at moszumanska.debian.org
Sun May 22 12:21:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
bbk-guest pushed a commit to branch master
in repository trigger-rally.
commit 99c3c1736042c68434c778cbdd2bcfac9fadc6af
Author: Stefan Potyra <sistpoty at ubuntu.com>
Date: Wed Oct 25 22:39:52 2006 +0000
* new upstream version
* cleaned up patches, which are no longer necessary
* cleaned up README.Debian (the old url is no longer)
* updated location of orig.tar.gz via svn-property.
---
debian/README.Debian | 5 +-
debian/TODO.Debian | 9 ---
debian/changelog | 19 +++--
debian/patches/05_Makefile.am.patch | 15 ----
debian/patches/10_src_glew_jamfile.patch | 12 ---
.../patches/15_fixup_physfs_alut_interaction.patch | 90 ----------------------
debian/patches/20_fix_build_with_gcc4.1.patch | 12 ---
debian/patches/30_physfs_sdl_interaction.patch | 25 ------
8 files changed, 13 insertions(+), 174 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 4651528..3f0c06d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,8 +1,7 @@
Note on installing plugins:
-If you want to install any plugins, like new levels on
-<http://www.positro.net/trigger/>, it's sufficient to copy the zip
-files into your ~/.trigger directory.
+If you want to install any plugins, like new levels, it's sufficient
+to copy the zip files into your ~/.trigger directory.
For a system wide installation, please copy plugins to
/usr/share/games/trigger/plugins.
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
deleted file mode 100644
index 19425b6..0000000
--- a/debian/TODO.Debian
+++ /dev/null
@@ -1,9 +0,0 @@
-Non-urgent, maybe with the next upstream release:
-* debian/rules: set DATADIR to /usr/share/games/trigger
-* update trigger-data
-* need a strict dependency on newer trigger-data.
-* update README.Debian
-
-Wishlist:
-* load plugins from /usr/local/games/trigger-plugins, not quite sure if that's
-actually an improvement over /usr/share/games/trigger-data/plugins
diff --git a/debian/changelog b/debian/changelog
index 1290244..f6d29ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,33 +1,36 @@
-trigger (0.5.2-3) UNRELEASED; urgency=low
+trigger (0.5.2.1-1) UNRELEASED; urgency=low
ATTENTION: needs updated trigger-data (0.5.2-2) with new
datadirs uploaded together!
(^ delete this before uploading ^)
- * Update the hint where to install plugins for all users in
- README.Debian to a saner location.
[ Gonéri Le Bouder ]
* data file are in /usr/share/games/trigger
[ Stefan Potyra ]
+ * New upstream version.
+ * Dropped patches (since integrated upstream):
+ + 10_src_glew_jamfile.patch
+ + 15_fixup_physfs_alut_interaction.patch
+ + 20_fix_build_with_gcc4.1.patch
+ + 30_physfs_sdl_interaction.patch
* Update homepage in control-file to new sourceforge homepage.
* Update watch file accordingly.
* Run automake during building:
+ Add build-depends on automake1.9 | automaken.
+ Add rule to build configure script.
- + Split 10_fix_build_with_openal.patch, to 05_Makefile.am.patch and
- 10_src_glew_jamfile.patch, dropping generated configure from it.
- Finally the patches are more clean.
+ Also delete configure, Jamconfig.in during clean (which are not
deleted by jam distclean).
+ Delete mk/autoconf/sdl.m4, since we use the newer macro supplied
by the debian sdl package instead.
- * Update 05_Makefile.am.patch to not link against zlib1g any longer,
+ * Add 05_Makefile.am.patch to not link against zlib1g any longer,
as trigger doesn't directly need any symbols from it.
* Make configure rule in debian/rules depend on apply-patches.
+ * Update the hint where to install plugins for all users in
+ README.Debian to a saner location.
- -- Stefan Potyra <sistpoty at ubuntu.com> Tue, 26 Sep 2006 01:33:09 +0200
+ -- Stefan Potyra <sistpoty at ubuntu.com> Wed, 25 Oct 2006 23:21:05 +0200
trigger (0.5.2-2) unstable; urgency=low
diff --git a/debian/patches/05_Makefile.am.patch b/debian/patches/05_Makefile.am.patch
index 9e47d90..75ec235 100644
--- a/debian/patches/05_Makefile.am.patch
+++ b/debian/patches/05_Makefile.am.patch
@@ -1,21 +1,6 @@
diff -Nur trigger-0.5.2/configure.ac trigger-0.5.2.new/configure.ac
--- trigger-0.5.2/configure.ac 2006-01-14 11:09:19.000000000 +0100
+++ trigger-0.5.2.new/configure.ac 2006-09-25 23:06:12.000000000 +0200
-@@ -97,11 +97,11 @@
- # assume UNIX system
- *)
-
-- AX_FINDLIB([AUDIOLIB], [OpenAL], [OpenAL],
-+ AX_FINDLIB([AUDIOLIB], [Alut], [Alut],
- AX_LANG_PROGRAM([#include <AL/alut.h>], [alutInit(0,0);]),
-- [], [-lopenal],
-+ [], [-lopenal -lalut],
- [],
-- [AC_MSG_ERROR([Please install OpenAL])])
-+ [AC_MSG_ERROR([Please install FreeALUT/OpenAL])])
-
- ;;
-
@@ -109,7 +109,7 @@
AX_FINDLIB([PHYSFS], [PhysFS], [PhysFS],
diff --git a/debian/patches/10_src_glew_jamfile.patch b/debian/patches/10_src_glew_jamfile.patch
deleted file mode 100644
index f6efd09..0000000
--- a/debian/patches/10_src_glew_jamfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trigger-0.5.2.orig/src/glew/Jamfile 2006-07-18 23:57:35.000000000 +0200
-+++ trigger-0.5.2/src/glew/Jamfile 2006-07-18 23:58:53.000000000 +0200
-@@ -4,7 +4,7 @@
- Library glew : [ Wildcard *.c *.cpp *.h ]
- [ Wildcard GL : *.h ] ;
-
--IncludeDir glew : GL ;
-+IncludeDir glew : . ;
-
- ExternalLibs glew : SDL SDLIMAGE SDLTTF AUDIOLIB GL PHYSFS ;
-
-
diff --git a/debian/patches/15_fixup_physfs_alut_interaction.patch b/debian/patches/15_fixup_physfs_alut_interaction.patch
deleted file mode 100644
index 011eeef..0000000
--- a/debian/patches/15_fixup_physfs_alut_interaction.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- trigger-0.5.2.orig/src/pengine/audio.cpp 2006-01-14 11:09:19.000000000 +0100
-+++ trigger-0.5.2/src/pengine/audio.cpp 2006-07-23 17:58:00.000000000 +0200
-@@ -158,7 +158,10 @@
- {
- PUtil::outLog() << "Initialising audio subsystem [OpenAL]" << std::endl;
-
-- alutInit(0, null);
-+ if (alutInit(0, null) != AL_TRUE) {
-+ throw MakePException("ALUT:alutInit() error: "
-+ + alutGetErrorString(alutGetError()));
-+ }
- }
-
- PSSAudio::~PSSAudio()
-@@ -180,9 +183,8 @@
- PUtil::outLog() << "Loading sample \"" << filename << "\"" << std::endl;
-
- unload();
--
-+ /* load contents from file into memory using physfs functions */
- name = filename;
--
- PHYSFS_file *pfile = PHYSFS_openRead(filename.c_str());
-
- if (!pfile) {
-@@ -195,26 +197,20 @@
-
- PHYSFS_read(pfile, wavbuffer, filesize, 1);
- PHYSFS_close(pfile);
--
-- ALenum format;
-- ALvoid *data = null;
-- ALsizei size, freq;
-- ALboolean loop;
--
-- alutLoadWAVMemory((ALbyte *)wavbuffer, &format, &data, &size, &freq, &loop);
--
-+
-+ /* create the alut buffer from memory contents */
-+ this->buffer = alutCreateBufferFromFileImage(
-+ reinterpret_cast<const ALvoid *>(wavbuffer),
-+ filesize);
-+
-+ /* clean up */
- delete [] wavbuffer;
--
-- if (!data) {
-- unload();
-- throw MakePException ("Sample load failed");
-+
-+ /* check if loading was successful */
-+ if (AL_NONE == this->buffer) {
-+ throw MakePException("Sample load failed:"
-+ + alutGetErrorString(alutGetError()));
- }
--
-- alGenBuffers(1, &buffer);
--
-- alBufferData(buffer, format, data, size, freq);
--
-- alutUnloadWAV(format, data, size, freq);
- }
-
- void PAudioSample::unload()
---- trigger-0.5.2.orig/src/pengine/audio.h 2006-01-14 11:09:19.000000000 +0100
-+++ trigger-0.5.2/src/pengine/audio.h 2006-07-23 17:59:13.000000000 +0200
-@@ -4,7 +4,9 @@
- // Copyright 2004-2006 Jasmine Langridge, jaz at positro.net
- // License: GPL version 2 (see included gpl.txt)
-
--
-+#ifdef USE_OPEANAL
-+#include <AL/al.h>
-+#endif
-
- class PSSAudio : public PSubsystem {
- private:
-@@ -22,7 +24,12 @@
- class PAudioSample : public PResource {
- private:
- //uint32 buffer;
-+
-+#ifdef USE_OPEANAL
-+ ALuint buffer; // the buffer of the waveform.
-+#else
- unsigned int buffer; // not sure, maybe this will aid x86_64 portability
-+#endif
-
- public:
- PAudioSample(const std::string &filename, bool positional3D = false);
diff --git a/debian/patches/20_fix_build_with_gcc4.1.patch b/debian/patches/20_fix_build_with_gcc4.1.patch
deleted file mode 100644
index bae29af..0000000
--- a/debian/patches/20_fix_build_with_gcc4.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru trigger-0.5.2.orig/src/pengine/tinyxml.h trigger-0.5.2/src/pengine/tinyxml.h
---- trigger-0.5.2.orig/src/pengine/tinyxml.h 2006-07-19 00:18:57.000000000 +0200
-+++ trigger-0.5.2/src/pengine/tinyxml.h 2006-07-19 00:21:47.000000000 +0200
-@@ -805,7 +805,7 @@
- #endif
-
- /// Construct.
-- TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-+ TiXmlDeclaration( const char * _version,
- const char * _encoding,
- const char * _standalone );
-
diff --git a/debian/patches/30_physfs_sdl_interaction.patch b/debian/patches/30_physfs_sdl_interaction.patch
deleted file mode 100644
index 3f719a1..0000000
--- a/debian/patches/30_physfs_sdl_interaction.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- trigger-0.5.2/src/pengine/physfs_rw.cpp 2006-01-14 11:09:19.000000000 +0100
-+++ trigger-0.5.2.orig/src/pengine/physfs_rw.cpp 2006-07-23 17:00:53.000000000 +0200
-@@ -16,6 +16,7 @@
- int target;
-
- int curpos = PHYSFS_tell(pfile);
-+ int result;
-
- switch (whence) {
- default:
-@@ -30,9 +31,12 @@
- break;
- }
-
-- PHYSFS_seek(pfile, target);
-+ result = PHYSFS_seek(pfile, target);
-+ if (! result) {
-+ MakePException("Error seeking: " + PHYSFS_getLastError());
-+ }
-
-- return curpos;
-+ return PHYSFS_tell(pfile);
- }
-
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git
More information about the Pkg-games-commits
mailing list