[SCM] bristol packaging branch, master, updated. debian/0.60.0-2-1-g36f995f

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

The following commit has been merged in the master branch:
commit 36f995f03cf7dcd30f8c4394f102a44618d2eec9
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Apr 22 00:51:00 2010 +0200

    Temporary switch to debian 3.0 (quilt) format to workaround bug#578693.

diff --git a/debian/control b/debian/control
index 2caf2e4..eccf38d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  libx11-dev,
  x11proto-core-dev,
  libasound2-dev,
- libjack-dev,
- quilt (>= 0.46-7~)
+ libjack-dev
 Standards-Version: 3.8.4
 Homepage: http://bristol.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-multimedia/bristol.git
diff --git a/debian/rules b/debian/rules
index 4a1e3a4..bef0bce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ EXTRA_CONFIGURE_ARGS += --disable-alsa
 endif
 
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_configure:
 	ln -f -s /usr/share/misc/config.guess
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
bristol packaging