[SCM] x264/master: Convert package to 3.0 (quilt).

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

The following commit has been merged in the master branch:
commit 76b16763d131e39af75985bed142b9fbe23bb64a
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 4 20:44:44 2011 -0400

    Convert package to 3.0 (quilt).

diff --git a/debian/control b/debian/control
index 7abff8f..77fd58a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 7),
                help2man,
                yasm [i386 amd64 kfreebsd-amd64 lpia],
                libx11-dev,
-               quilt
 Standards-Version: 3.9.2
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cafd205..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-# Nothing to patch
diff --git a/debian/rules b/debian/rules
index 7603f60..735596b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 libx264N := $(shell sed -rn 's/^Package:[[:space:]]*(libx264-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -17,8 +15,7 @@ include debian/confflags
 
 LDFLAGS += -Wl,--as-needed
 
-build: build-stamp
-build-stamp: debian/stamp-patched
+build:
 	dh_testdir
 	# Build static lib
 	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
@@ -38,7 +35,7 @@ ifeq ($(do_opt),yes)
 endif
 	touch $@
 
-debian/x264.1: build-stamp
+debian/x264.1:
 	help2man -n"fast h264 encoder" -N -s1 -S "Videolan project" -h '--fullhelp' \
 		debian/install/static/usr/bin/x264 > $@
 
@@ -47,8 +44,7 @@ clean:
 	dh_testroot
 	rm -rf debian/install
 	$(MAKE) -o config.mak distclean
-	$(MAKE) -f debian/rules unpatch
-	dh_clean build-stamp debian/x264.1 config.mak2
+	dh_clean build debian/x264.1 config.mak2
 
 install:
 	dh_testdir
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/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

-- 
x264 packaging