Bug#751974: Packages should not Build-Depends libavcodec53, libavformat53

[Chris Jester-Young]

Package: java-package
Version: 0.55
Tags: patch jessie sid

As of java-package 0.55, the generated source packages Build-Depends
libavcodec53 and libavformat53 when building for Java 8. This is not
correct, as it makes the packages unbuildable on jessie and sid, which
are currently on libavcodec55 and libavformat55.

The correct solution is to follow what was done for #687075, which is
to exclude the libavplugin.so plugin from the dependencies.

Below is a patch which implements this.

Cheers,
Chris.

			*	*	*

>From 7a071d26cf0ae778b214a99a8b0f38b2441860b3 Mon Sep 17 00:00:00 2001
From: Chris Jester-Young <cky944 at gmail.com>
Date: Wed, 18 Jun 2014 08:24:35 -0400
Subject: [PATCH] Do not Build-Depends libavcodec53 and libavformat53.

---
 lib/javase.sh | 2 +-
 lib/jdk.sh    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/javase.sh b/lib/javase.sh
index e6592cc..c4f55f8 100644
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -77,7 +77,7 @@ override_dh_compress:
 	dh_compress \$(shell find $j2se_name/man/ -type f ! -name '*.gz' -printf '${jvm_base##/}/%p\n')
 
 override_dh_shlibdeps:
-	dh_shlibdeps --exclude=fxavcodecplugin -l\$(shell find $j2se_name -type f -name '*.so*' -printf '${jvm_base##/}/%h\n' | sort -u | tr '\n' ':' | sed 's/:\$\$//')
+	dh_shlibdeps --exclude=fxavcodecplugin --exclude=avplugin -l\$(shell find $j2se_name -type f -name '*.so*' -printf '${jvm_base##/}/%h\n' | sort -u | tr '\n' ':' | sed 's/:\$\$//')
 EOF
 }
 
diff --git a/lib/jdk.sh b/lib/jdk.sh
index 39a4cee..8858bb6 100644
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -1,9 +1,6 @@
 
 j2sdk_control() {
     build_depends="libasound2, libgl1-mesa-glx, libgtk2.0-0, libxslt1.1, libxtst6, libxxf86vm1"
-    if test "$j2se_release" = 8; then
-        build_depends="$build_depends, libavcodec53, libavformat53"
-    fi
     j2se_control
     java_browser_plugin="java-browser-plugin, "
     depends="\${shlibs:Depends}"
-- 
1.9.1