Do not Build-Depends libavcodec53 and libavformat53.

[sven/java-package.git] / lib / javase.sh

diff --git a/lib/javase.sh b/lib/javase.sh
index 93215da8fc6c11f5d1129dc7e9a35262ac0df7ba..c4f55f8f5d9a06781bc31ca84a38273f049d3ea6 100644 (file)
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -21,12 +21,15 @@ EOF
 }
 
 j2se_control() {
+    if test -n "$build_depends"; then
+        build_depends=", $build_depends"
+    fi
     cat << EOF
 Source: $j2se_package
 Section: non-free/devel
 Priority: optional
 Maintainer: $maintainer_name <$maintainer_email>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9)${build_depends}
 Standards-Version: 3.9.5
 
 EOF
@@ -54,7 +57,7 @@ File: $jvm_base$file
 ----------------------------------------------------------------------
 
 EOF
-        cat "$file"
+        iconv -f ISO-8859-15 -t UTF-8 "$file" | sed 's/[ \t]*$//'
         cat << EOF
 
 ----------------------------------------------------------------------
@@ -74,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
 }
 
@@ -197,21 +200,36 @@ jinfos() {
 }
 
 j2se_build() {
-    cd "$package_dir"
-    echo "Create debian package:"
+    if [ -n "$build_source" ]; then
+        local source_dir=${j2se_package}-${j2se_version}
+        echo "    copy ${source_dir} into directory $working_dir/"
+        rm -rf "$working_dir/${source_dir}"
+        cp -r "$package_dir" "$working_dir/${source_dir}"
+        cat << EOF
 
+The Debian source package has been created in the current directory.
+You can build the package with:
+
+    cd ${source_dir}
     dpkg-buildpackage -b -uc -us
-    cd "$tmp"
-    local deb_filename="$( echo "${j2se_package}_"*.deb )"
-    echo "    copy $deb_filename into directory $working_dir/"
-    cp "$deb_filename" "$working_dir/"
-    if [ -n "$genchanges" ]; then
-        echo "    dpkg-genchanges"
-        local changes_filename="${deb_filename%.deb}.changes"
-        echo "    copy $changes_filename into directory $working_dir/"
-        cp "$changes_filename" "$working_dir/"
-    fi
-    cat << EOF
+
+EOF
+    else
+        cd "$package_dir"
+        echo "Create debian package:"
+
+        dpkg-buildpackage -b -uc -us
+        cd "$tmp"
+        local deb_filename="$( echo "${j2se_package}_"*.deb )"
+        echo "    copy $deb_filename into directory $working_dir/"
+        cp "$deb_filename" "$working_dir/"
+        if [ -n "$genchanges" ]; then
+            echo "    dpkg-genchanges"
+            local changes_filename="${deb_filename%.deb}.changes"
+            echo "    copy $changes_filename into directory $working_dir/"
+            cp "$changes_filename" "$working_dir/"
+        fi
+        cat << EOF
 
 The Debian package has been created in the current directory.
 You can install the package as root with:
@@ -219,4 +237,5 @@ You can install the package as root with:
     dpkg -i $deb_filename
 
 EOF
+    fi
 }