Do not Build-Depends libavcodec53 and libavformat53.

diff --git a/lib/javase.sh b/lib/javase.sh
index e6592ccb6102c420aa58f84a76bdf88dcc10538f..c4f55f8f5d9a06781bc31ca84a38273f049d3ea6 100644 (file)
--- 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 39a4ceec3c5fa0332d4aa2c1c19a8f8feb721076..8858bb62eb7bf08ab6e6fbac4f5ced906f93489a 100644 (file)
--- 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}"