[SCM] bristol packaging branch, master, updated. debian/0.60.0-3-5-gfef7e53

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

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

    Update changelog.

diff --git a/debian/changelog b/debian/changelog
index ac7855e..84e70ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ 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.
+  * Drop debian/patches/02-implicit_pointer_conversion.patch patch,
+    applied upstream.
   * Patch to fix FTBFS on hurd-i386.
 
  -- Alessio Treglia <quadrispro at ubuntu.com>  Fri, 23 Apr 2010 09:49:32 +0200

-- 
bristol packaging