[SCM] mplayer packaging branch, master, updated. upstream/0.svn20090303-68-gdae3a89

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5d9d43a13d28c9981bc4327389b5947a9c581286
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 20:18:39 2009 +0100

    Replace dpatch with quilt.
    
    in pkg-multimedia, quilt is much more common use than dpatch. This time,
    I figured out that rebasing the (rather impressive) set of dpatches
    against the new upstream version is extremly painful, since dpatch
    offers no assistance to rebase the patch. Quilt on the other hand works
    on a per-file (instead of a global-tree) basis.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/control b/debian/control
index 0e3c937..f3fc65d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer;a=summary
 Homepage: http://www.mplayerhq.hu/
 Build-Depends-Indep: 
 Build-Depends: debhelper (>= 7),
-	       dpatch,
 	       ladspa-sdk,
 	       libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 	       libaudio-dev,
@@ -57,6 +56,7 @@ Build-Depends: debhelper (>= 7),
 	       make,
 	       pkg-config,
 	       po-debconf,
+	       quilt,
 	       vstream-client-dev,
 	       x11proto-core-dev,
 	       zlib1g-dev
diff --git a/debian/rules b/debian/rules
index 1cf88ee..522d309 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -146,20 +148,10 @@ endif
 #DEB_BUILD_CONFIGURE += --enable-libavutil_so --enable-libavformat_so --enable-libavcodec_so --enable-libpostproc_so 
 #EXTRA_BUILDDEP += libavcodec-dev (>= 0.svn6767), libavformat-dev (>= 0.svn6767), libpostproc-dev (>= 0.svn6767)
 
-########### build
-
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 ####### build-arch
 
 configure: configure-arch-stamp
-configure-arch-stamp: patch-stamp
+configure-arch-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	#Check consistency between debian/control and what we are compiling.
 	grep -x 'Source: $(package)'  debian/control
@@ -229,9 +221,9 @@ build: build-indep build-arch
 
 ################ clean
 
-clean: clean-patched
+clean: clean-real unpatch
 
-clean-patched: unpatch
+clean-real:
 	dh_testdir
 	dh_testroot
 	# commands to clean up after the build process

-- 
mplayer packaging