[trigger-rally] 30/103: Package: * 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 during clean. * Update 05_Makefile.am.patch to not link against zlib1g any longer, as trigger doesn't directly need any symbols from it. Svn: * set svn-bp:origUrl (currently pointing to debian ftp, since this upstream version is in the repo already * try to get rid of the now unneeded trigger directory.
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 202f419d82d799cf0eef5782f80a7976de45f79f
Author: Stefan Potyra <sistpoty at ubuntu.com>
Date: Mon Sep 25 21:16:26 2006 +0000
Package:
* 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 during clean.
* Update 05_Makefile.am.patch to not link against zlib1g any longer,
as trigger doesn't directly need any symbols from it.
Svn:
* set svn-bp:origUrl (currently pointing to debian ftp, since this
upstream version is in the repo already
* try to get rid of the now unneeded trigger directory.
General warning: do not upload this version w.o. a newer trigger-data version,
since the data-path changed (during the last commit actually).
I put a prominent notice in the changelog ;).
---
debian/changelog | 21 +-
debian/control | 4 +-
debian/patches/05_Makefile.am.patch | 27 ++
debian/patches/10_fix_build_with_openal.patch | 492 --------------------------
debian/patches/10_src_glew_jamfile.patch | 12 +
debian/rules | 5 +-
debian/watch | 3 +-
7 files changed, 65 insertions(+), 499 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 53a247e..036dc54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,29 @@
trigger (0.5.2-3) UNRELEASED; urgency=low
- * Update the hint where to install plugins for all users in
+ 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 <sistpoty at ubuntu.com> Wed, 26 Jul 2006 17:04:18 +0200
+ [ Stefan Potyra ]
+ * 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 during clean.
+ * Update 05_Makefile.am.patch to not link against zlib1g any longer,
+ as trigger doesn't directly need any symbols from it.
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Mon, 25 Sep 2006 23:07:17 +0200
trigger (0.5.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7b41bfa..dfca8dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: trigger
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.0), jam, libopenal-dev, libalut-dev, libphysfs-dev, libsdl-image1.2-dev, docbook-to-man, cdbs
+Build-Depends: debhelper (>= 5.0.0), jam, libopenal-dev, libalut-dev, libphysfs-dev, libsdl-image1.2-dev, docbook-to-man, cdbs, automake1.9 | automaken
Standards-Version: 3.7.2
Uploaders: Stefan Potyra <sistpoty at ubuntu.com>, Gonéri Le Bouder <goneri at rulezlan.org>, Alexander Schmehl <tolimar at debian.org>
@@ -20,4 +20,4 @@ Description: free 3D rally racing car game
* 64 MB Ram
* good OpenGL hardware accellerated video card (NVidia Geforce or better)
.
- Homepage: http://www.positro.net/trigger/
+ Homepage: http://sourceforge.net/projects/trigger-rally
diff --git a/debian/patches/05_Makefile.am.patch b/debian/patches/05_Makefile.am.patch
new file mode 100644
index 0000000..9e47d90
--- /dev/null
+++ b/debian/patches/05_Makefile.am.patch
@@ -0,0 +1,27 @@
+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],
+ AX_LANG_PROGRAM([#include <physfs.h>], [PHYSFS_init(0);]),
+- [], [-lphysfs -lz],
++ [], [-lphysfs],
+ [],
+ [AC_MSG_ERROR([Please install PhysFS])])
+
diff --git a/debian/patches/10_fix_build_with_openal.patch b/debian/patches/10_fix_build_with_openal.patch
deleted file mode 100644
index f3e7dc2..0000000
--- a/debian/patches/10_fix_build_with_openal.patch
+++ /dev/null
@@ -1,492 +0,0 @@
-diff -ruN trigger-0.5.2.orig/configure trigger-0.5.2/configure
---- trigger-0.5.2.orig/configure 2006-07-18 23:57:35.000000000 +0200
-+++ trigger-0.5.2/configure 2006-07-18 23:58:36.000000000 +0200
-@@ -721,13 +721,13 @@
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- srcdir=$ac_confdir
-- if test ! -r "$srcdir/$ac_unique_file"; then
-+ if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r "$srcdir/$ac_unique_file"; then
-+if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
-@@ -736,7 +736,7 @@
- { (exit 1); exit 1; }; }
- fi
- fi
--(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
-+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
- { (exit 1); exit 1; }; }
- srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-@@ -875,7 +875,7 @@
- automatically; uses dir, dir/include and dir/lib
- --with-libFMOD=dir specify location of libFMOD if not detected
- automatically; uses dir, dir/include and dir/lib
-- --with-libOpenAL=dir specify location of libOpenAL if not detected
-+ --with-libAlut=dir specify location of libAlut if not detected
- automatically; uses dir, dir/include and dir/lib
- --with-libPhysFS=dir specify location of libPhysFS if not detected
- automatically; uses dir, dir/include and dir/lib
-@@ -986,7 +986,7 @@
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -1858,8 +1858,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -1917,8 +1916,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -1989,8 +1987,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2034,8 +2031,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2519,8 +2515,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2578,8 +2573,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2695,8 +2689,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2750,8 +2743,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2796,8 +2788,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -2841,8 +2832,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3128,8 +3118,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3228,8 +3217,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3349,8 +3337,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3412,9 +3399,9 @@
-
-
-
--# Check whether --with-libOpenAL or --without-libOpenAL was given.
--if test "${with_libOpenAL+set}" = set; then
-- withval="$with_libOpenAL"
-+# Check whether --with-libAlut or --without-libAlut was given.
-+if test "${with_libAlut+set}" = set; then
-+ withval="$with_libAlut"
-
- fi;
-
-@@ -3423,24 +3410,24 @@
- save_LIBS="$LIBS"
-
- RESCFLAGS=""
-- RESLIBS="-lopenal"
-+ RESLIBS="-lopenal -lalut"
- CFLAGS="$CFLAGS "
- CPPFLAGS="$CPPFLAGS "
-- LIBS="$LIBS -lopenal "
-+ LIBS="$LIBS -lopenal -lalut "
-
-- if test -n "$with_libOpenAL"; then
-+ if test -n "$with_libAlut"; then
-
-- CFLAGS="-I$with_libOpenAL/include $CFLAGS"
-- CPPFLAGS="-I$with_libOpenAL/include $CPPFLAGS"
-- LIBS="-L$with_libOpenAL/lib $LIBS"
-- RESCFLAGS="-I$with_libOpenAL/include $RESCFLAGS"
-- RESLIBS="-L$with_libOpenAL/lib $RESLIBS"
-+ CFLAGS="-I$with_libAlut/include $CFLAGS"
-+ CPPFLAGS="-I$with_libAlut/include $CPPFLAGS"
-+ LIBS="-L$with_libAlut/lib $LIBS"
-+ RESCFLAGS="-I$with_libAlut/include $RESCFLAGS"
-+ RESLIBS="-L$with_libAlut/lib $RESLIBS"
-
- fi
-
-
-- echo "$as_me:$LINENO: checking for OpenAL" >&5
--echo $ECHO_N "checking for OpenAL... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for Alut" >&5
-+echo $ECHO_N "checking for Alut... $ECHO_C" >&6
-
- cat >conftest.$ac_ext <<_ACEOF
- #include <AL/alut.h>
-@@ -3462,8 +3449,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3511,8 +3497,8 @@
- if test $buildok = yes; then
- :
- else
-- { { echo "$as_me:$LINENO: error: Please install OpenAL" >&5
--echo "$as_me: error: Please install OpenAL" >&2;}
-+ { { echo "$as_me:$LINENO: error: Please install FreeALUT/OpenAL" >&5
-+echo "$as_me: error: Please install FreeALUT/OpenAL" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-@@ -3574,8 +3560,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -3868,6 +3853,7 @@
- echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-+ac_path_x_has_been_run=yes
-
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -3960,7 +3946,7 @@
- /usr/openwin/share/include'
-
- if test "$ac_x_includes" = no; then
-- # Guess where to find include files, by looking for Intrinsic.h.
-+ # Guess where to find include files, by looking for a specified header file.
- # First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3968,7 +3954,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -3995,7 +3981,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- for ac_dir in $ac_x_header_dirs; do
-- if test -r "$ac_dir/X11/Intrinsic.h"; then
-+ if test -r "$ac_dir/X11/Xlib.h"; then
- ac_x_includes=$ac_dir
- break
- fi
-@@ -4009,18 +3995,18 @@
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
-- LIBS="-lXt $LIBS"
-+ LIBS="-lX11 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- int
- main ()
- {
--XtMalloc (0)
-+XrmInitialize ()
- ;
- return 0;
- }
-@@ -4034,8 +4020,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4059,7 +4044,7 @@
- do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
-- if test -r $ac_dir/libXt.$ac_extension; then
-+ if test -r $ac_dir/libX11.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
-@@ -4095,8 +4080,12 @@
- # Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
-+ # It might be that x_includes is empty (headers are found in the
-+ # standard search path. Then output the corresponding message
-+ ac_out_x_includes=$x_includes
-+ test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
- fi
-
-
-@@ -4156,8 +4145,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4337,8 +4325,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4408,8 +4395,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4455,8 +4441,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4620,8 +4605,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4791,8 +4775,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -4905,8 +4888,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5068,8 +5050,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -5188,8 +5169,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -6152,11 +6132,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -6195,6 +6170,12 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
-diff -ruN trigger-0.5.2.orig/configure.ac trigger-0.5.2/configure.ac
---- trigger-0.5.2.orig/configure.ac 2006-07-18 23:57:35.000000000 +0200
-+++ trigger-0.5.2/configure.ac 2006-07-18 23:58:36.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])])
-
- ;;
-
-diff -ruN trigger-0.5.2.orig/src/glew/Jamfile trigger-0.5.2/src/glew/Jamfile
---- 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/10_src_glew_jamfile.patch b/debian/patches/10_src_glew_jamfile.patch
new file mode 100644
index 0000000..f6efd09
--- /dev/null
+++ b/debian/patches/10_src_glew_jamfile.patch
@@ -0,0 +1,12 @@
+--- 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/rules b/debian/rules
index 3f6c47d..ffb11a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,8 +35,8 @@ $(MANPAGES): $(addsuffix .sgml,$(MANPAGES))
# config.status-rule must also depend on configure, and configure must
# be older than configure.ac
-#configure: configure.ac
-# ./autogen.sh
+configure: configure.ac
+ ./autogen.sh
config.status: configure
dh_testdir
@@ -58,6 +58,7 @@ clean::
# Add here commands to clean up after the build process.
-jam distclean
$(RM) $(MANPAGES)
+ $(RM) configure
dh_clean
install: build $(MANPAGES)
diff --git a/debian/watch b/debian/watch
index 76ec876..dc73640 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
version=3
#http://www.positro.net/trigger/download.php trigger-0\.(.*)-src\.tar\.bz2
-http://files.scapecaster.com/posit/trigger-(\d+\..+)-src\.tar\.bz2
+#http://files.scapecaster.com/posit/trigger-(\d+\..+)-src\.tar\.bz2
+http://sf.net/trigger-rally/trigger-(\d+\..+)-src\.tar\.bz2
--
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