[SCM] Packaging for bam branch, master, updated. upstream/0.4.0-34-g9945f56

[Felix Geyer]

The following commit has been merged in the master branch:
commit acb983aaea07123739cd8a84a9c5808ed1b329a9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Oct 23 18:51:19 2011 +0200

    Rename use-debian-liblua.diff to make-unix.diff.
    
    - Pass build flags to gcc.
    - Print commands that are executed.

diff --git a/debian/changelog b/debian/changelog
index 578a082..4761932 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bam (0.4.0-4) UNRELEASED; urgency=low
+
+  * Rename use-debian-liblua.diff to make-unix.diff and:
+    - Pass build flags to gcc.
+    - Print commands that are executed.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 23 Oct 2011 17:16:30 +0200
+
 bam (0.4.0-3) unstable; urgency=low
 
   * use-debian-liblua.diff: don't hardcode lua5.1 pkg-config file path.
diff --git a/debian/patches/make-unix.diff b/debian/patches/make-unix.diff
new file mode 100644
index 0000000..e77a2c8
--- /dev/null
+++ b/debian/patches/make-unix.diff
@@ -0,0 +1,20 @@
+Description: Exit on errors, print commands that are executed, pass build flags
+ to gcc and use pkg-config to get lua5.1 flags.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+diff --git a/make_unix.sh b/make_unix.sh
+--- a/make_unix.sh
++++ b/make_unix.sh
+@@ -1,4 +1,10 @@
+ #!/bin/sh
+-gcc -Wall -ansi -pedantic src/tools/txt2c.c -o src/tools/txt2c
++
++set -e
++
++echo gcc -Wall -ansi -pedantic $CFLAGS $CPPFLAGS $LDFLAGS src/tools/txt2c.c `pkg-config --cflags lua5.1` -o src/tools/txt2c
++gcc -Wall -ansi -pedantic $CFLAGS $CPPFLAGS $LDFLAGS src/tools/txt2c.c `pkg-config --cflags lua5.1` -o src/tools/txt2c
++echo "src/tools/txt2c src/base.lua src/tools.lua src/driver_gcc.lua src/driver_cl.lua > src/internal_base.h"
+ 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 $*
++echo gcc -Wall -ansi -pedantic $CFLAGS $CPPFLAGS $LDFLAGS src/*.c -o bam `pkg-config --cflags --libs lua5.1` -lm -lpthread -ldl -rdynamic $*
++gcc -Wall -ansi -pedantic $CFLAGS $CPPFLAGS $LDFLAGS src/*.c -o bam `pkg-config --cflags --libs lua5.1` -lm -lpthread -ldl -rdynamic $*
diff --git a/debian/patches/series b/debian/patches/series
index 7135c63..bb83b08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-use-debian-liblua.diff
+make-unix.diff
 test-error-exit-code.diff
 fix-ftbfs-kfreebsd.diff
 fix-ftbfs-tests-fpic.diff
diff --git a/debian/patches/use-debian-liblua.diff b/debian/patches/use-debian-liblua.diff
deleted file mode 100644
index b39a52c..0000000
--- a/debian/patches/use-debian-liblua.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Gonéri Le Bouder <goneri at rulezlan.org>
-Subject: [PATCH] debian/use-debian-liblua
-
-Use Debian liblua
-
-Signed-off-by: Gonéri Le Bouder <goneri at rulezlan.org>
-
----
- make_unix.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/make_unix.sh b/make_unix.sh
-index 5ad0868..a3d2961 100755
---- a/make_unix.sh
-+++ b/make_unix.sh
-@@ -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 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 lua5.1` -lm -lpthread -ldl -O2 -rdynamic $*
diff --git a/debian/rules b/debian/rules
index 0a2f188..8d9ddf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ override_dh_auto_configure:
 	# nothing to do
 
 override_dh_auto_build:
-	sh -e -v make_unix.sh
+	sh make_unix.sh
 	python scripts/gendocs.py
 
 override_dh_auto_test:

-- 
Packaging for bam