[SCM] a52dec/master: ubuntu_50_fix_imdct_error_msg.diff: Rename to 50_fix_imdct_error_msg.diff and apply it also in the Debian build (Closes: #441693).

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

The following commit has been merged in the master branch:
commit 6af2ea836e81167f649ec5f9b4f560c2a7981390
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Dec 3 13:20:56 2010 +0100

    ubuntu_50_fix_imdct_error_msg.diff: Rename to 50_fix_imdct_error_msg.diff and apply it also in the Debian build (Closes: #441693).

diff --git a/debian/patches/ubuntu_50_fix_imdct_error_msg.diff b/debian/patches/50_fix_imdct_error_msg.diff
similarity index 100%
rename from debian/patches/ubuntu_50_fix_imdct_error_msg.diff
rename to debian/patches/50_fix_imdct_error_msg.diff
diff --git a/debian/patches/series b/debian/patches/series
index ff83eed..24f6046 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 01-enable-pic.diff
 02-soname.diff
 03-link-against-lm.diff
-
+50_fix_imdct_error_msg.diff
diff --git a/debian/rules b/debian/rules
index 90f16f9..6768024 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,7 @@
 #!/usr/bin/make -f
-DEB_VENDOR ?= $(shell dpkg-vendor --derives-from Ubuntu && echo Ubuntu) 
 
 %:
 	dh $@ --with quilt,autoreconf
 
-override_dh_quilt_patch:
-ifneq (,$(findstring Ubuntu,$(DEB_VENDOR)))
-	echo $(notdir $(wildcard debian/patches/ubuntu*)) >> debian/patches/series
-endif
-	dh_quilt_patch
-
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-shared
-
-override_dh_quilt_unpatch:
-	dh_quilt_unpatch
-	sed -i /ubuntu.*/d debian/patches/series

-- 
a52dec packaging