[trigger-rally] 75/103: First steps towards new upstream version: * drop 05_Makefile.am.patch: Integrated upstream. * refresh 10_system_glew.patch * change property referring to orig tarball to match the new one (already in place there). * change distribution to UNRELEASE and document that there's more work todo...
Bertrand Marc
bbk-guest at moszumanska.debian.org
Sun May 22 12:21:28 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 53b01d2759cdbb7ab10e930a101c40998ccedeba
Author: Stefan Potyra <sistpoty at ubuntu.com>
Date: Fri Nov 11 21:47:07 2011 +0000
First steps towards new upstream version:
* drop 05_Makefile.am.patch: Integrated upstream.
* refresh 10_system_glew.patch
* change property referring to orig tarball to match the new one (already in
place there).
* change distribution to UNRELEASE and document that there's more work todo...
---
debian/changelog | 9 ++++++
debian/patches/05_Makefile.am.patch | 15 ----------
debian/patches/10_system_glew.patch | 60 ++++++++++++++++++-------------------
debian/patches/series | 1 -
4 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 08e1e2f..c3fdc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+trigger-rally (0.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/patches/05_Makefile.am.patch: dropped, included upstream.
+ * Refresh debian/patches/10_system_glew.patch.
+ [More work TODO...]
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Fri, 11 Nov 2011 21:58:06 +0100
+
trigger-rally (0.5.2.1-2) unstable; urgency=low
[ Gonéri Le Bouder ]
diff --git a/debian/patches/05_Makefile.am.patch b/debian/patches/05_Makefile.am.patch
deleted file mode 100644
index a7fdd41..0000000
--- a/debian/patches/05_Makefile.am.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: trigger-rally doesn't directly use any of the zlib symbols,
- don't link against libz hence.
-Origin: http://trigger-rally.svn.sourceforge.net/viewvc/trigger-rally/configure.ac?r1=1&r2=3
-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
-@@ -109,7 +109,7 @@
-
- AX_FINDLIB([PHYSFS], [PhysFS], [PhysFS],
- AX_LANG_PROGRAM([#include <physfs.h>], [PHYSFS_init(0);]),
-- [], [-lphysfs -lz],
-+ [], [-lphysfs],
- [],
- [AC_MSG_ERROR([Please install PhysFS])])
-
diff --git a/debian/patches/10_system_glew.patch b/debian/patches/10_system_glew.patch
index 060b30a..a1e4aba 100644
--- a/debian/patches/10_system_glew.patch
+++ b/debian/patches/10_system_glew.patch
@@ -3,10 +3,10 @@ Description: trigger-rally ships an internal copy of glew. This patch forces
.
It's not clean enough yet to be committed upstream, I'll work on this.
Author: Stefan Potyra <sistpoty at ubuntu.com>
-Index: trigger-rally-0.5.2.1/autogen.sh
+Index: trigger-rally-0.6.0/autogen.sh
===================================================================
---- trigger-rally-0.5.2.1.orig/autogen.sh 2010-03-28 15:52:27.155526849 +0200
-+++ trigger-rally-0.5.2.1/autogen.sh 2010-03-28 15:49:28.356327937 +0200
+--- trigger-rally-0.6.0.orig/autogen.sh 2011-10-07 19:10:49.000000000 +0200
++++ trigger-rally-0.6.0/autogen.sh 2011-11-11 22:26:28.891511342 +0100
@@ -18,6 +18,7 @@
# seems autoconf --trace misses some things :-/
echo 'INSTALL ?= "@INSTALL@" ;' >> Jamconfig.in
@@ -15,10 +15,10 @@ Index: trigger-rally-0.5.2.1/autogen.sh
# autoheader/config.h not used by trigger yet
autoheader
-Index: trigger-rally-0.5.2.1/configure.ac
+Index: trigger-rally-0.6.0/configure.ac
===================================================================
---- trigger-rally-0.5.2.1.orig/configure.ac 2010-03-28 15:52:26.705514097 +0200
-+++ trigger-rally-0.5.2.1/configure.ac 2010-03-28 15:49:08.525590227 +0200
+--- trigger-rally-0.6.0.orig/configure.ac 2011-10-07 19:10:49.000000000 +0200
++++ trigger-rally-0.6.0/configure.ac 2011-11-11 22:26:28.891511342 +0100
@@ -123,6 +123,12 @@
AC_MSG_ERROR([Couldn't find GLU library and headers])
fi
@@ -32,10 +32,10 @@ Index: trigger-rally-0.5.2.1/configure.ac
# Um, can't get this to substitute [app]datadir :/
#AC_DEFINE([DATADIR], [$(datadir)], [comment])
-Index: trigger-rally-0.5.2.1/src/Jamfile
+Index: trigger-rally-0.6.0/src/Jamfile
===================================================================
---- trigger-rally-0.5.2.1.orig/src/Jamfile 2010-03-28 15:52:26.975526812 +0200
-+++ trigger-rally-0.5.2.1/src/Jamfile 2010-03-28 15:50:28.346233037 +0200
+--- trigger-rally-0.6.0.orig/src/Jamfile 2011-10-07 19:10:02.000000000 +0200
++++ trigger-rally-0.6.0/src/Jamfile 2011-11-11 22:26:28.891511342 +0100
@@ -7,7 +7,10 @@
C++FLAGS += -DDATADIR='\"$(datadir)\"' ;
@@ -48,10 +48,10 @@ Index: trigger-rally-0.5.2.1/src/Jamfile
SubInclude TOP src pengine ;
SubInclude TOP src psim ;
SubInclude TOP src trigger ;
-Index: trigger-rally-0.5.2.1/src/pengine/Jamfile
+Index: trigger-rally-0.6.0/src/pengine/Jamfile
===================================================================
---- trigger-rally-0.5.2.1.orig/src/pengine/Jamfile 2010-03-28 15:52:26.805523301 +0200
-+++ trigger-rally-0.5.2.1/src/pengine/Jamfile 2010-03-28 15:52:19.539998764 +0200
+--- trigger-rally-0.6.0.orig/src/pengine/Jamfile 2011-10-07 19:10:01.000000000 +0200
++++ trigger-rally-0.6.0/src/pengine/Jamfile 2011-11-11 22:26:28.895511341 +0100
@@ -4,6 +4,8 @@
Library pengine : [ Wildcard *.c *.cpp *.h ]
[ Wildcard GL : *.h ] ;
@@ -63,23 +63,21 @@ Index: trigger-rally-0.5.2.1/src/pengine/Jamfile
+ LinkWith pengine : glew ;
+ IncludeDir pengine : ../glew ;
+}
-Index: trigger-rally-0.5.2.1/src/pengine/pengine.h
+Index: trigger-rally-0.6.0/src/pengine/pengine.h
===================================================================
---- trigger-rally-0.5.2.1.orig/src/pengine/pengine.h 2010-03-28 15:52:26.875527960 +0200
-+++ trigger-rally-0.5.2.1/src/pengine/pengine.h 2010-03-28 15:51:25.717564253 +0200
-@@ -30,11 +30,12 @@
- // The PhysicsFS game file system
- #include <physfs.h>
-
--
--// This is a slightly modified GLEW for internal build
-+#ifdef HAVE_GLEW_H
-+#include <GL/glew.h>
-+#else /* use statically shipped version */
- #define GLEW_STATIC
- #include "GL/glew.h"
--
-+#endif
-
- // TinyXML is built into the pengine library
- #include "tinyxml.h"
+--- trigger-rally-0.6.0.orig/src/pengine/pengine.h 2011-10-07 19:10:01.000000000 +0200
++++ trigger-rally-0.6.0/src/pengine/pengine.h 2011-11-11 22:28:38.447505433 +0100
+@@ -31,9 +31,13 @@
+ #include <physfs.h>
+
+
++#ifdef HAVE_GLEW_H
++#include <GL/glew.h>
++#else /* use statically shipped version */
+ // This is a slightly modified GLEW for internal build
+ #define GLEW_STATIC
+ #include "GL/glew.h"
++#endif /* HAVE_GLEW_H */
+
+
+ // TinyXML is built into the pengine library
diff --git a/debian/patches/series b/debian/patches/series
index c31ecc7..90e55ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-05_Makefile.am.patch
10_system_glew.patch
--
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