Commit ab46ffa3 authored by Sven Hoexter's avatar Sven Hoexter Committed by Sven Höxter

add --no-deps option which overrides dh_shlibs

This feature allows us to create one Debian package,
which can be installed on different Debian releases.
parent 3687764d
java-package (0.63) UNRELEASED; urgency=medium java-package (0.63) UNRELEASED; urgency=medium
[ Emmanuel Bourg ]
* Team upload. * Team upload.
* Removed support for the browser plugin (Closes: #779725) * Removed support for the browser plugin (Closes: #779725)
* Suggest openjdk-8-jre instead of openjdk-7-jre * Suggest openjdk-8-jre instead of openjdk-7-jre
...@@ -7,7 +8,11 @@ java-package (0.63) UNRELEASED; urgency=medium ...@@ -7,7 +8,11 @@ java-package (0.63) UNRELEASED; urgency=medium
* Switch to debhelper level 11 * Switch to debhelper level 11
* Use salsa.debian.org Vcs-* URLs * Use salsa.debian.org Vcs-* URLs
-- Emmanuel Bourg <ebourg@apache.org> Wed, 04 Jan 2017 16:07:59 +0100 [ Sven Hoexter ]
* Add "--no-deps" commandline option to override execution of
"dh_shlibsdeps". (Closes: #857847)
--
java-package (0.62) unstable; urgency=medium java-package (0.62) unstable; urgency=medium
......
...@@ -88,12 +88,21 @@ EOF ...@@ -88,12 +88,21 @@ EOF
override_dh_compress: override_dh_compress:
dh_compress \$(shell find $j2se_name/man/ -type f ! -name '*.gz' -printf '${jvm_base##/}/%p\n') dh_compress \$(shell find $j2se_name/man/ -type f ! -name '*.gz' -printf '${jvm_base##/}/%p\n')
override_dh_shlibdeps:
dh_shlibdeps \$(EXCLUDE_LIBS) -l\$(shell find $j2se_name -type f -name '*.so*' -printf '${jvm_base##/}/%h\n' | sort -u | tr '\n' ':' | sed 's/:\$\$//')
override_dh_strip_nondeterminism: override_dh_strip_nondeterminism:
# Disable dh_strip_nondeterminism to speed up the build # Disable dh_strip_nondeterminism to speed up the build
EOF EOF
if [ "${no_deps:-false}" == "true" ]; then
cat << EOF
override_dh_shlibdeps:
# Disabled, aides to generate one package for different Debian releases - BTS #857847
EOF
else
cat << EOF
override_dh_shlibdeps:
dh_shlibdeps \$(EXCLUDE_LIBS) -l\$(shell find $j2se_name -type f -name '*.so*' -printf '${jvm_base##/}/%h\n' | sort -u | tr '\n' ':' | sed 's/:\$\$//')
EOF
fi
} }
j2se_doc_rules() { j2se_doc_rules() {
...@@ -106,6 +115,12 @@ j2se_doc_rules() { ...@@ -106,6 +115,12 @@ j2se_doc_rules() {
override_dh_strip_nondeterminism: override_dh_strip_nondeterminism:
# Disable dh_strip_nondeterminism to speed up the build # Disable dh_strip_nondeterminism to speed up the build
EOF EOF
if [ "${no_deps:-false}" == "true" ]; then
cat << EOF
override_dh_shlibdeps:
# Disabled, aides to generate one package for different Debian releases - BTS #857847
EOF
fi
} }
......
...@@ -89,6 +89,7 @@ The following options are recognized: ...@@ -89,6 +89,7 @@ The following options are recognized:
--source build a source package instead of a binary deb package --source build a source package instead of a binary deb package
--with-system-certs integrate with the system's keystore --with-system-certs integrate with the system's keystore
--jce-policy FILE Replace cryptography files with versions from FILE --jce-policy FILE Replace cryptography files with versions from FILE
--no-deps Adds override for dh_shlibdeps based "Depends"
--help display this help and exit --help display this help and exit
--version output version information and exit --version output version information and exit
...@@ -146,6 +147,8 @@ while [[ $# -gt 0 && "x$1" == x--* ]]; do ...@@ -146,6 +147,8 @@ while [[ $# -gt 0 && "x$1" == x--* ]]; do
revision="-${1}" revision="-${1}"
elif [[ "x$1" == x--changes ]]; then elif [[ "x$1" == x--changes ]]; then
genchanges="true" genchanges="true"
elif [[ "x$1" == x--no-deps ]]; then
no_deps="true"
elif [[ "x$1" == x--source ]]; then elif [[ "x$1" == x--source ]]; then
build_source="true" build_source="true"
elif [[ "x$1" == x--with-system-certs ]]; then elif [[ "x$1" == x--with-system-certs ]]; then
......
...@@ -70,6 +70,10 @@ ca-certificates and ca-certificates-java packages. ...@@ -70,6 +70,10 @@ ca-certificates and ca-certificates-java packages.
Replace cryptography files with versions Replace cryptography files with versions
from the specified JCE_POLICY_FILE. from the specified JCE_POLICY_FILE.
.TP .TP
.B --no-deps
Adds override for dh_shlibdeps based "Depends". Allows to build a package
without Debian release specific depdencies.
.TP
.B --help .B --help
display help text and exit display help text and exit
.TP .TP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment