[SCM] Packaging for bam branch, master, updated. upstream/0.4.0-30-g0f7765a

Felix Geyer debfx-pkg at fobos.de
Sat Aug 20 08:56:12 UTC 2011


The following commit has been merged in the master branch:
commit 0f7765aa950c16ed64dad377c7202ca6e59232e3
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Aug 20 10:55:49 2011 +0200

    Don't hardcode lua5.1 pkg-config file path.

diff --git a/debian/changelog b/debian/changelog
index 0fae4f1..0cf6f79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bam (0.4.0-3) UNRELEASED; urgency=low
+
+  * use-debian-liblua.diff: don't hardcode lua5.1 pkg-config file path.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 20 Aug 2011 10:38:01 +0200
+
 bam (0.4.0-2) unstable; urgency=low
 
   * Fix FTBFS on GNU/kFreeBSD, mips and armhf.
diff --git a/debian/patches/use-debian-liblua.diff b/debian/patches/use-debian-liblua.diff
index 6dbf451..b39a52c 100644
--- a/debian/patches/use-debian-liblua.diff
+++ b/debian/patches/use-debian-liblua.diff
@@ -16,7 +16,7 @@ index 5ad0868..a3d2961 100755
 @@ -1,4 +1,4 @@
  #!/bin/sh
 -gcc -Wall -ansi -pedantic src/tools/txt2c.c -o src/tools/txt2c
-+gcc -Wall -ansi -pedantic src/tools/txt2c.c `pkg-config --cflags /usr/lib/pkgconfig/lua5.1.pc` -o src/tools/txt2c
++gcc -Wall -ansi -pedantic src/tools/txt2c.c `pkg-config --cflags lua5.1` -o src/tools/txt2c
  src/tools/txt2c src/base.lua src/tools.lua src/driver_gcc.lua src/driver_cl.lua > src/internal_base.h
 -gcc -Wall -ansi -pedantic src/*.c src/lua/*.c -o bam -I src/lua -lm -lpthread -ldl -O2 -rdynamic $*
-+gcc -Wall -ansi -pedantic src/*.c -o bam `pkg-config --cflags --libs /usr/lib/pkgconfig/lua5.1.pc` -lm -lpthread -ldl -O2 -rdynamic $*
++gcc -Wall -ansi -pedantic src/*.c -o bam `pkg-config --cflags --libs lua5.1` -lm -lpthread -ldl -O2 -rdynamic $*

-- 
Packaging for bam



More information about the Pkg-games-commits mailing list