From: Chris Jester-Young <cky944@gmail.com>
Date: Wed, 18 Jun 2014 12:24:35 +0000 (-0400)
Subject: Do not Build-Depends libavcodec53 and libavformat53.
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=cdcda798fbcbf25868ecee7091a8ab0bcbe1de78;p=sven%2Fjava-package.git

Do not Build-Depends libavcodec53 and libavformat53.
---

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}"