Bug#623682: [PATCH 2/3] use source format 3.0 (quilt)

[Jonathan Nieder]

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.

This works very nicely with dpkg-dev version 1.15.5.4 (2009-12-07) or
1.14.28 (2010-01-03) and later.  In particular, since the modified
files on't need to be touched at build time, it avoids unnecessary
trouble when using "make", "git diff", "git reset --hard", "git
merge", and other tools.

Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>
---
 Doxyfile             |    2 +-
 debian/changelog     |    1 +
 debian/control       |    1 -
 debian/rules         |    9 +++------
 debian/source/format |    2 +-
 libavcodec/avcodec.h |    2 +-
 libavcodec/utils.c   |    2 +-
 libavcodec/version.h |    3 +++
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index 5d80a2b..d7a550e 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -563,7 +563,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                =
+EXCLUDE                = debian debian-shared debian-static debian-cmov .pc .git
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/debian/changelog b/debian/changelog
index dc47350..0a70434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libav (4:0.7~b1-2.1) local; 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)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index df4e617..9d85f28 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3684,7 +3684,7 @@ int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h);
 
 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_THREAD_INIT
 /**
  * @deprecated Set s->thread_count before calling avcodec_open() instead of calling this.
  */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 6d31254..49ffa70 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1287,7 +1287,7 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field)
 
 #endif
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
+#if FF_API_THREAD_INIT
 
 int avcodec_thread_init(AVCodecContext *s, int thread_count)
 {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 7e53474..1ddee2c 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -86,5 +86,8 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
+#ifndef FF_API_THREAD_INIT
+#define FF_API_THREAD_INIT      (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
 
 #endif /* AVCODEC_VERSION_H */
-- 
1.7.5