[Git][java-team/java-package][master] 4 commits: Standards-Version updated to 4.2.1
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Oct 16 13:54:25 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / java-package
Commits:
c78449b0 by Emmanuel Bourg at 2018-10-16T11:39:35Z
Standards-Version updated to 4.2.1
- - - - -
85c15d5a by Emmanuel Bourg at 2018-10-16T11:39:39Z
Switch to debhelper level 11
- - - - -
e321186e by Emmanuel Bourg at 2018-10-16T11:39:47Z
Use salsa.debian.org Vcs-* URLs
- - - - -
3687764d by Emmanuel Bourg at 2018-10-16T11:41:20Z
Removed support for the browser plugin (Closes: #779725)
- - - - -
7 changed files:
- debian/changelog
- debian/compat
- debian/control
- lib/common.sh
- lib/javase.sh
- lib/oracle-jdk.sh
- lib/oracle-jre.sh
Changes:
=====================================
debian/changelog
=====================================
@@ -1,7 +1,11 @@
java-package (0.63) UNRELEASED; urgency=medium
* Team upload.
+ * Removed support for the browser plugin (Closes: #779725)
* Suggest openjdk-8-jre instead of openjdk-7-jre
+ * Standards-Version updated to 4.2.1
+ * Switch to debhelper level 11
+ * Use salsa.debian.org Vcs-* URLs
-- Emmanuel Bourg <ebourg at apache.org> Wed, 04 Jan 2017 16:07:59 +0100
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
@@ -3,14 +3,14 @@ Section: contrib/misc
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Cédric Pineau <cedric.pineau at gmail.com>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/java-package.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java-package.git
+Build-Depends: debhelper (>= 11)
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/java-package.git
+Vcs-Browser: https://salsa.debian.org/java-team/java-package
Package: java-package
Architecture: all
-Depends: debhelper (>= 9),
+Depends: debhelper (>= 11),
build-essential,
dpkg-dev,
fakeroot,
=====================================
lib/common.sh
=====================================
@@ -202,15 +202,6 @@ get_architecture() {
echo "Detected Debian GNU type: ${DEB_BUILD_GNU_TYPE:-N/A}"
}
-# get browser plugin directories
-get_browser_plugin_dirs() {
- if dpkg-vendor --derives-from Ubuntu; then
- export browser_plugin_dirs="xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner"
- else
- export browser_plugin_dirs=mozilla
- fi
-}
-
get_distribution() {
if [ -n "$distribution" ]; then
target_distribution="$distribution"
=====================================
lib/javase.sh
=====================================
@@ -142,18 +142,6 @@ if [ "\$1" = configure ]; then
fi
done
}
-
- # install_browser_plugin link_path link_name plugin_name plugin
- install_browser_plugin() {
- local link_path="\$1"
- local link_name="\$2"
- local plugin_name="\$3"
- local plugin="\$4"
- [ -d "\$link_path" ] || install -d -m 755 "\$link_path"
- if [[ -f "\$plugin" ]]; then
- update-alternatives --install "\$link_path/\$link_name" "\$plugin_name" "\$plugin" ${priority_override:-$j2se_priority}
- fi
- }
EOF
if [ "$create_cert_softlinks" == "true" ];then
cat >> "$debian_dir/postinst" << EOF
@@ -194,13 +182,6 @@ case "\$1" in
done
}
- # remove_browser_plugin plugin_name plugin
- remove_browser_plugin() {
- local plugin_name="\$1"
- local plugin="\$2"
- update-alternatives --remove "\$plugin_name" "\$plugin"
- }
-
EOF
eval "$j2se_remove" >> "$debian_dir/prerm"
=====================================
lib/oracle-jdk.sh
=====================================
@@ -126,13 +126,6 @@ fi
install_no_man_alternatives $jvm_base$j2se_name/jre/lib $oracle_jre_lib_hl
install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
-# No plugin for ARM architecture yet
-if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
-plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
-for b in $browser_plugin_dirs;do
- install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-done
-fi
EOF
}
@@ -150,13 +143,6 @@ fi
remove_alternatives $jvm_base$j2se_name/jre/lib $oracle_jre_lib_hl
remove_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
-# No plugin for ARM architecture yet
-if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
-plugin_dir="$jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH"
-for b in $browser_plugin_dirs;do
- remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-done
-fi
EOF
}
@@ -173,17 +159,11 @@ EOF
fi
jinfos "hl" $jvm_base$j2se_name/jre/lib/ $oracle_jre_lib_hl
jinfos "jdk" $jvm_base$j2se_name/bin/ $oracle_bin_jdk
- if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
- for b in $browser_plugin_dirs;do
- echo "plugin iceweasel-javaplugin.so $jvm_base$j2se_name/jre/lib/$DEB_BUILD_ARCH/libnpjp2.so"
- done
- fi
}
oracle_j2sdk_control() {
build_depends="libasound2, libgl1-mesa-glx, libgtk2.0-0, libxslt1.1, libxtst6, libxxf86vm1"
j2se_control
- java_browser_plugin="java-browser-plugin, "
depends="\${shlibs:Depends}"
if [ "${DEB_BUILD_ARCH:0:3}" = "arm" -a "${j2se_arch}" != "arm-vfp-hflt" ]; then
# ARM is only softfloat ATM so if building on armhf
@@ -191,8 +171,6 @@ oracle_j2sdk_control() {
if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then
depends="libc6-armel, libsfgcc1, libsfstdc++6"
fi
- # No browser on ARM yet
- java_browser_plugin=""
fi
if [ "$create_cert_softlinks" == "true" ]; then
depends="$depends, ca-certificates-java"
@@ -208,7 +186,7 @@ Package: $j2se_package
Architecture: $j2se_debian_arch
Depends: \${misc:Depends}, java-common, $depends
Recommends: netbase
-Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, $provides_headless java-sdk, java2-sdk, $provides_sdk
+Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, $provides_headless java-sdk, java2-sdk, $provides_sdk
Description: $j2se_title
The Java(TM) SE JDK is a development environment for building
applications, applets, and components that can be deployed on the
=====================================
lib/oracle-jre.sh
=====================================
@@ -98,10 +98,6 @@ install_alternatives $jvm_base$j2se_name/bin $oracle_jre_bin_jre
install_no_man_alternatives $jvm_base$j2se_name/bin $oracle_no_man_jre_bin_jre
install_no_man_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
-plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
-for b in $browser_plugin_dirs;do
- install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-done
EOF
}
@@ -116,10 +112,6 @@ remove_alternatives $jvm_base$j2se_name/bin $oracle_jre_bin_jre
remove_alternatives $jvm_base$j2se_name/bin $oracle_no_man_jre_bin_jre
remove_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
-plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
-for b in $browser_plugin_dirs;do
- remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-done
EOF
}
@@ -133,9 +125,6 @@ EOF
jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_jre_bin_jre
jinfos "jre" $jvm_base$j2se_name/bin/ $oracle_no_man_jre_bin_jre
jinfos "hl" $jvm_base$j2se_name/lib/ $oracle_jre_lib_hl
- for b in $browser_plugin_dirs;do
- echo "plugin $b-javaplugin.so $jvm_base$j2se_name/lib/$DEB_BUILD_ARCH/libnpjp2.so"
- done
}
oracle_j2re_control() {
@@ -153,7 +142,7 @@ Package: $j2se_package
Architecture: $j2se_debian_arch
Depends: \${misc:Depends}, \${shlibs:Depends}, java-common, $depends
Recommends: netbase
-Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime java-runtime-headless, java2-runtime-headless, $provides_headless java-browser-plugin
+Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime java-runtime-headless, java2-runtime-headless, $provides_headless
Description: $j2se_title
The Java(TM) SE Runtime Environment contains the Java virtual machine,
runtime class libraries, and Java application launcher that are
View it on GitLab: https://salsa.debian.org/java-team/java-package/compare/66a06e9d63e012225d76923035968f7fa571171e...3687764d8079ea43fc38aea67d6242b1df438a79
--
View it on GitLab: https://salsa.debian.org/java-team/java-package/compare/66a06e9d63e012225d76923035968f7fa571171e...3687764d8079ea43fc38aea67d6242b1df438a79
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181016/ef8606d6/attachment.html>
More information about the pkg-java-commits
mailing list