[SCM] bristol packaging branch, master, updated. debian/0.60.0-3-1-g2a4b300

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

The following commit has been merged in the master branch:
commit 2a4b3004db089bcb91613923617d9ff58c2acfc9
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Apr 22 17:33:34 2010 +0200

    Switch back to deb format 1.0, bug#578693 has been fixed.

diff --git a/debian/control b/debian/control
index eccf38d..8e06135 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Alessio Treglia <quadrispro at ubuntu.com>,
  Free Ekanayaka <freee at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
+ quilt (>= 0.46-7~),
  autotools-dev,
  libx11-dev,
  x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index bef0bce..4a1e3a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ EXTRA_CONFIGURE_ARGS += --disable-alsa
 endif
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_configure:
 	ln -f -s /usr/share/misc/config.guess
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+1.0

-- 
bristol packaging