[SCM] a52dec packaging branch, master, updated. debian/0.7.4-13-5-gc4b8378

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

The following commit has been merged in the master branch:
commit c4b83784b000cdfeffa0906e450c6272d1f01570
Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
Date:   Fri May 7 21:28:59 2010 +0100

    Ubuntu vendor patch
    
    * adding ubuntu_50_fix_imdct_error_msg.diff (see #441693) and applying it if:
      + DEB_VENDOR is set and contains Ubuntu
      + DEB_VENDOR is not set and dpkg-vendor says it's Ubuntu derivative
    * debian/control:
      + bump policy version, no change required.
      + update email address.

diff --git a/debian/changelog b/debian/changelog
index 4dab126..685011e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+a52dec (0.7.4-15) UNRELEASED; urgency=low
+
+  [ Dmitrijs Ledkovs ]
+  * adding ubuntu_50_fix_imdct_error_msg.diff (see #441693) and applying it if:
+    + DEB_VENDOR is set and contains Ubuntu
+    + DEB_VENDOR is not set and dpkg-vendor says it's Ubuntu derivative
+  * debian/control:
+    + bump policy version, no change required.
+    + update email address.
+  
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Fri, 07 May 2010 19:56:03 +0000
+
 a52dec (0.7.4-14) unstable; urgency=low
 
   [ Reinhard Tartler ]
diff --git a/debian/control b/debian/control
index 81a8cb3..5c6d7eb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
-           Dmitrijs Ledkovs <dmitrij.ledkov at gmail.com>
+           Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
 Build-Depends: autotools-dev,
                quilt (>= 0.46-7),
                debhelper (>= 7.0.50~)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/pkg-multimedia/a52dec.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/a52dec.git;a=summary
 Homepage: http://liba52.sourceforge.net/
diff --git a/debian/patches/ubuntu_50_fix_imdct_error_msg.diff b/debian/patches/ubuntu_50_fix_imdct_error_msg.diff
new file mode 100644
index 0000000..fa205ae
--- /dev/null
+++ b/debian/patches/ubuntu_50_fix_imdct_error_msg.diff
@@ -0,0 +1,19 @@
+Description: This patch removes annoying (useless) message on stderr. This is a
+vendor patch for eveyone that derives from Ubuntu.
+Origin: https://bugs.edge.launchpad.net/ubuntu/+source/a52dec/+bug/124951/comments/1
+Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/a52dec/+bug/124951
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=441693
+Forwarded: not-needed
+Index: lucid/liba52/imdct.c
+===================================================================
+--- lucid.orig/liba52/imdct.c	2009-12-24 06:49:48.000000000 +0200
++++ lucid/liba52/imdct.c	2009-12-24 07:06:26.000000000 +0200
+@@ -425,7 +425,7 @@
+     } else
+ #endif
+     {
+-	fprintf (stderr, "No accelerated IMDCT transform found\n");
++	// fprintf (stderr, "No accelerated IMDCT transform found\n");
+ 	ifft128 = ifft128_c;
+ 	ifft64 = ifft64_c;
+     }
diff --git a/debian/rules b/debian/rules
index c85054c..e7cc617 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,19 @@
 #!/usr/bin/make -f
+DEB_VENDOR ?= $(shell dpkg-vendor --derives-from Ubuntu && echo Ubuntu) 
 
 %:
 	dh --with quilt $@ 
 
+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:
 	ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess autotools/
 	dh_auto_configure -- --enable-shared
+
+override_dh_quilt_unpatch:
+	dh_quilt_unpatch
+	sed -i /ubuntu.*/d debian/patches/series

-- 
a52dec packaging