[SCM] bristol packaging branch, master, updated. debian/0.60.5-1-3-g7b3bf1d

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7b3bf1de5c74f35ce10cd3211be820542b0d682c
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 3 20:33:26 2010 +0200

    Switch to 3.0 (quilt) format.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/control b/debian/control
index 6bbd941..1934b6d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Alessio Treglia <alessio at debian.org>,
  Free Ekanayaka <freee at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
- quilt (>= 0.46-7~),
  autotools-dev (>= 20100122.1),
  libx11-dev,
  x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index 8ccf21e..983518e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ EXTRA_CONFIGURE_ARGS += --disable-alsa
 endif
 
 %:
-	dh --with quilt,autotools_dev $@
+	dh --with autotools_dev $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --libdir=\$${prefix}/lib/bristol \
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