[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-24-g4c019fc

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 45371df7c9b78845e5f756a7e7834760ffa395fb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 9 12:15:45 2010 +0100

    remove quilt infrastructure

diff --git a/debian/control b/debian/control
index 59cff9f..5067bb9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
 Uploaders: Reinhard Tartler <siretart at tauware.de>
 Build-Depends: debhelper (>= 7),
                yasm [i386 amd64 kfreebsd-amd64 lpia],
-               libx11-dev,
-               quilt
+               libx11-dev
 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
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
index 31362c0..f3f346a 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)
@@ -19,7 +17,7 @@ CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 LDFLAGS += -Wl,--as-needed
 
 build: build-stamp
-build-stamp: debian/stamp-patched
+build-stamp:
 	dh_testdir
 	# fix version.sh for the debian package
 	mv version.sh version.sh-upstream
@@ -50,7 +48,6 @@ 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
 
 install:

-- 
x264 packaging