[SCM] bristol packaging branch, master, updated. debian/0.40.7-1-2-g82997a1

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 82997a1a218eb98ee3a0eee54f2a9ff65ed5cc09
Author: Alessio Treglia <alessio at msiu90.(none)>
Date:   Sun Jan 3 19:09:09 2010 +0100

    Fix bug #563435

diff --git a/debian/changelog b/debian/changelog
index fda1a49..354839a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bristol (0.40.7-2) UNRELEASED; urgency=low
+
+  * debian/patches/02-implicit_pointer_conversion.patch: Function
+    'bristolmalloc' implicitly converted to pointer, this was due to
+    a missing function prototype (Closes: #563435).
+
+ -- Alessio Treglia <alessio at msiu90>  Sun, 03 Jan 2010 19:05:03 +0100
+
 bristol (0.40.7-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/02-implicit_pointer_conversion.patch b/debian/patches/02-implicit_pointer_conversion.patch
new file mode 100644
index 0000000..a443c5d
--- /dev/null
+++ b/debian/patches/02-implicit_pointer_conversion.patch
@@ -0,0 +1,17 @@
+Origin: Debian
+Description: Fix missing function prototype definition.
+Bug: http://bugs.debian.org/563435
+---
+ libbristolic/sid.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- bristol.orig/libbristolic/sid.c
++++ bristol/libbristolic/sid.c
+@@ -133,6 +133,7 @@
+ #include <math.h>
+ 
+ #include "bristolsid.h"
++#include "bristol.h"
+ 
+ #define B_SID_RAMP		0
+ #define B_SID_TRI		1
diff --git a/debian/patches/series b/debian/patches/series
index 85166ca..ae0f722 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-spelling_errors.patch
+02-implicit_pointer_conversion.patch

-- 
bristol packaging