[SCM] bristol packaging branch, master, updated. debian/0.40.7-2-31-g7a0c640

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

The following commit has been merged in the master branch:
commit 7a0c640bde9ba90f13d7206eaaba41a8876a3277
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Tue Apr 20 20:54:31 2010 +0200

    Forward a patch to upstream.

diff --git a/debian/changelog b/debian/changelog
index 6054b6a..b46f0b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ bristol (0.60.0-1) unstable; urgency=low
   * Add autotools support.
   * Refresh debian/patches/01-spelling_errors.patch patch.
   * debian/rules: Set JACK as default AUDIO and MIDI driver.
+  * debian/patches/02-implicit_pointer_conversion.patch:
+    - Forwarded to upstream.
 
- -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 20 Apr 2010 20:42:57 +0200
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 20 Apr 2010 20:53:20 +0200
 
 bristol (0.50.6-1) experimental; urgency=low
 
diff --git a/debian/patches/02-implicit_pointer_conversion.patch b/debian/patches/02-implicit_pointer_conversion.patch
index 8004605..86db168 100644
--- a/debian/patches/02-implicit_pointer_conversion.patch
+++ b/debian/patches/02-implicit_pointer_conversion.patch
@@ -1,6 +1,7 @@
 Origin: Debian
 Description: Fix missing function prototype definition.
 Bug: http://bugs.debian.org/563435
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2990043&group_id=157415&atid=803734
 ---
  libbristolic/sid.c |    1 +
  1 file changed, 1 insertion(+)

-- 
bristol packaging