[SCM] bristol packaging branch, master, updated. debian/0.60.0-3-4-g1a262c9

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

The following commit has been merged in the master branch:
commit 1a262c9cf1260136df867d575d9505655656d9b8
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Fri Apr 23 09:49:53 2010 +0200

    New upload.

diff --git a/debian/changelog b/debian/changelog
index 25c419d..ac7855e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bristol (0.60.0-4) unstable; urgency=low
+
+  * Switch back to deb format 1.0, bug#578693 has been fixed.
+  * Refresh and improvements, another attempt to fix FTBFS on
+    hppa,sparc,s390.
+  * Patch to fix FTBFS on hurd-i386.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Fri, 23 Apr 2010 09:49:32 +0200
+
 bristol (0.60.0-3) unstable; urgency=low
 
   * debian/patches/04-fix_alsa_presence_check.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 8387f19..7303eb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 01-spelling_errors.patch
-02-implicit_pointer_conversion.patch
 03-kfreebsd_ftbfs.patch
 04-fix_alsa_presence_check.patch
+05-hurd_ftbfs.patch

-- 
bristol packaging