[SCM] Packaging for bam branch, master, updated. upstream/0.4.0-28-g3cffc98

[Felix Geyer]

The following commit has been merged in the master branch:
commit a60b182396196da9a9f0e85a1821be778d1cc4f7
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon May 16 16:55:46 2011 +0200

    Always add the -fPIC flag in the sharedlib test.

diff --git a/debian/changelog b/debian/changelog
index 0df4b5d..9709c11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 bam (0.4.0-2) UNRELEASED; urgency=low
 
-  * Fix FTBFS on GNU/kFreeBSD and mips.
-    - Add fix-ftbfs-kfreebsd.diff
-    - Add fix-ftbfs-mips.diff
+  * Fix FTBFS on GNU/kFreeBSD, mips and armhf.
+    - Add fix-ftbfs-kfreebsd.diff (Closes: #626726)
+    - Add fix-ftbfs-tests-fpic.diff (Closes: #626749)
   * Only install useful doc files.
   * Remove Gonéri Le Bouder from Uploaders on his request.
 
diff --git a/debian/patches/fix-ftbfs-mips.diff b/debian/patches/fix-ftbfs-mips.diff
deleted file mode 100644
index 0a531d5..0000000
--- a/debian/patches/fix-ftbfs-mips.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix FTBFS on mips.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-
-diff --git a/src/platform.h b/src/platform.h
---- a/src/platform.h
-+++ b/src/platform.h
-@@ -104,6 +104,11 @@
- 	#define BAM_ARCH_STRING "sparc"
- #endif
- 
-+#if defined(__mips__)
-+	#define BAM_ARCH_MIPS
-+	#define BAM_ARCH_STRING "mips"
-+#endif
-+
- 
- #ifndef BAM_FAMILY_STRING
- #define BAM_FAMILY_STRING "unknown"
-diff --git a/tests/sharedlib/bam.lua b/tests/sharedlib/bam.lua
---- a/tests/sharedlib/bam.lua
-+++ b/tests/sharedlib/bam.lua
-@@ -1,6 +1,6 @@
- settings = NewSettings() 
- 
--if arch == "amd64" then
-+if (arch == "amd64") or (arch == "mips") then
- 	settings.cc.flags:Add("-fPIC")
- end
-  
diff --git a/debian/patches/fix-ftbfs-tests-fpic.diff b/debian/patches/fix-ftbfs-tests-fpic.diff
new file mode 100644
index 0000000..8616fd8
--- /dev/null
+++ b/debian/patches/fix-ftbfs-tests-fpic.diff
@@ -0,0 +1,16 @@
+Description: Fix FTBFS on mips.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+diff --git a/tests/sharedlib/bam.lua b/tests/sharedlib/bam.lua
+--- a/tests/sharedlib/bam.lua
++++ b/tests/sharedlib/bam.lua
+@@ -1,8 +1,6 @@
+ settings = NewSettings() 
+ 
+-if arch == "amd64" then
+-	settings.cc.flags:Add("-fPIC")
+-end
++settings.cc.flags:Add("-fPIC")
+  
+ src = Collect("*.cpp") 
+ objs = Compile(settings, src) 
diff --git a/debian/patches/series b/debian/patches/series
index e2dc69a..7135c63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 use-debian-liblua.diff
 test-error-exit-code.diff
 fix-ftbfs-kfreebsd.diff
-fix-ftbfs-mips.diff
+fix-ftbfs-tests-fpic.diff

-- 
Packaging for bam