[SCM] ffmpeg/master: use source format 3.0 (quilt)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c260bc50c75b82b0bba286d8ceff8e0f8f991878
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Tue May 3 13:23:37 2011 +0200

    use source format 3.0 (quilt)
    
    Allow dpkg-source to apply patches when unpacking the source.  We no
    longer need to keep track of whether the source is patched or not, and
    quilt is no longer required at build time.

diff --git a/debian/changelog b/debian/changelog
index a66178a..b98306a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libav (4:0.7~b1-3) UNRELEASED; urgency=low
   * only install doc/APIChanges in *-dev and libav-doc packages
   * move note on source package lineage to README.Debian
   * install NEWS.Debian in libavcodec-dev
+  * use dpkg source format 3.0 (quilt)
 
  -- Jonathan Nieder <jrnieder at gmail.com>  Mon, 02 May 2011 19:10:14 -0500
 
diff --git a/debian/control b/debian/control
index ffe607c..59ba400 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,6 @@ Build-Depends: debhelper (>= 7),
  libxext-dev,
  libxfixes-dev,
  libxvmc-dev,
- quilt,
  texi2html,
  yasm [amd64 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 sparc powerpc],
  zlib1g-dev
diff --git a/debian/rules b/debian/rules
index 67db8aa..d883601 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 EPOCH=4:
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
@@ -61,12 +59,11 @@ build: build-stamp
 build-stamp: $(addprefix build-stamp-, $(FLAVORS)) debian-shared/tools/qt-faststart
 	touch $@
 
-clean: clean-real unpatch
-clean-real:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
-	    $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp \
+	    $(addprefix configure-stamp-, $(FLAVORS)) \
 	    build-doxy-stamp
 	rm -rf $(addprefix debian-, $(FLAVORS)) doxy
 	dh_clean
@@ -153,7 +150,7 @@ binary-arch: build install codecs.txt formats.txt
 binary: binary-indep binary-arch
 
 .PHONY: build $(addprefix build-, $(FLAVORS)) build-doxy \
-	clean clean-real \
+	clean \
 	configure $(addprefix configure-, $(FLAVORS)) \
 	binary binary-indep binary-arch \
 	install \
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)

-- 
Libav/FFmpeg packaging