X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fjavase.sh;h=7c328999021d2c7720cbd143cf0a55c2fc89b8ba;hp=93215da8fc6c11f5d1129dc7e9a35262ac0df7ba;hb=bdc0b6eb75d6c746f6754d762a4a3a6a27125324;hpb=c15f2409a0e8601a99afcb5c8c711125cc75e0e9

diff --git a/lib/javase.sh b/lib/javase.sh
index 93215da..7c32899 100644
--- a/lib/javase.sh
+++ b/lib/javase.sh
@@ -12,7 +12,7 @@ EOF
 
 j2se_changelog() {
     cat << EOF
-$j2se_package ($j2se_version) unstable; urgency=low
+$j2se_package ($j2se_version) unstable; urgency=medium
 
   * This package was created with java-package ($version).
 
@@ -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,10 +77,26 @@ 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/:\$\$//')
+
+override_dh_strip_nondeterminism:
+	# Disable dh_strip_nondeterminism to speed up the build
+EOF
+}
+
+j2se_doc_rules() {
+    cat << EOF
+#!/usr/bin/make -f
+
+%:
+	dh \$@
+
+override_dh_strip_nondeterminism:
+	# Disable dh_strip_nondeterminism to speed up the build
 EOF
 }
 
+
 j2se_install_scripts() {
     cat > "$debian_dir/postinst" << EOF
 #!/bin/bash
@@ -123,8 +142,16 @@ if [ "\$1" = configure ]; then
           update-alternatives --install "\$link_path/\$link_name" "\$plugin_name" "\$plugin" $j2se_priority
         fi
     }
-
 EOF
+    if [ "$create_cert_softlinks" == "true" ];then
+        cat >> "$debian_dir/postinst" << EOF
+    for subdir in lib/security jre/lib/security;do
+        if [ -f $jvm_base$j2se_name/\$subdir/cacerts ]; then
+            ln -sf /etc/ssl/certs/java/cacerts $jvm_base$j2se_name/\$subdir/cacerts
+        fi
+    done
+EOF
+    fi
     eval "$j2se_install" >> "$debian_dir/postinst"
 
     cat >> "$debian_dir/postinst" << EOF
@@ -197,21 +224,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 +261,5 @@ You can install the package as root with:
     dpkg -i $deb_filename
 
 EOF
+    fi
 }