[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3++final-0ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 7a46da8f787ed0f224d3cf851264170edaa0f0cd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 2 18:07:21 2010 +0200

    convert to source Format: 3.0 (quilt)

diff --git a/debian/control b/debian/control
index 4d74686..1a16ec5 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,6 @@ Build-Depends: debhelper (>= 7),
                libxxf86vm-dev,
                libvdpau-dev [i386 amd64],
                pkg-config,
-               quilt,
                vstream-client-dev,
                x11proto-core-dev,
                xsltproc,
diff --git a/debian/rules b/debian/rules
index c9c88c0..953cf73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -88,7 +86,7 @@ endif
 # https://wiki.ubuntu.com/DistCompilerFlags
 CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS
 
-install-arch: $(QUILT_STAMPFN)
+install-arch:
 	dh_testdir
 	dh_prep -a
 	[ ! -f config.mak ] || $(MAKE) distclean
@@ -133,12 +131,12 @@ install-indep-stamp:
 
 ################ clean
 
-clean: clean-real unpatch
-clean-real:
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f config.mak ] || $(MAKE) distclean
 	dh_clean build-arch-stamp configure-arch-stamp snapshot_version
+	! test -d .git || quilt pop -a || test $$? = 2
 
 # Build architecture-independent packages
 binary-indep: install-indep
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/options b/debian/source/options
new file mode 100644
index 0000000..98a0c1a
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+single-debian-patch
+skip-patches

-- 
mplayer packaging