[SCM] x264/ubuntu: reintroduce quilt infrastructure

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit c019dc565d5ecd9806540184eb2d5d672d76c6be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Sep 18 10:44:33 2010 +0200

    reintroduce quilt infrastructure
    
    This reverts commit 45371df7c9b78845e5f756a7e7834760ffa395fb.
    
    Conflicts:
    
    	debian/control
    	debian/rules

diff --git a/debian/control b/debian/control
index 90685c4..db273be 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 7),
                help2man,
                yasm [i386 amd64 kfreebsd-amd64 lpia],
                libgpac-dev,
-               libx11-dev
+               libx11-dev,
+               quilt
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index b95fd4f..e6a7afe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/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)
@@ -16,7 +18,7 @@ include debian/confflags
 LDFLAGS += -Wl,--as-needed
 
 build: build-stamp
-build-stamp:
+build-stamp: debian/stamp-patched
 	dh_testdir
 	# fix version.sh for the debian package
 	mv version.sh version.sh-upstream
@@ -51,6 +53,7 @@ clean:
 	rm -rf debian/install
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f version.sh-upstream ] ||  mv version.sh-upstream version.sh
+	$(MAKE) -f debian/rules unpatch
 	dh_clean build-stamp debian/x264.1
 
 install:

-- 
x264 packaging