------------------------------------------------------------
revno: 668
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Thu 2016-02-25 14:01:31 +0100
message:
  openjdk-8 (8u72-b15-3) unstable; urgency=medium
  
    * Split out an openjdk-8-jdk-headless package.
    * Don't run the tests on Ubuntu xenial (openjdk-8 now in main,
      jtreg in universe).
    * Recognize -dcevm as a jvm. Closes: #814421.
    * Update libgconf/libgnome jre recommendations. Closes: #813943.
    * Update package reference in README. Closes: #814605.
    * Add french translation for policytool desktop file. Addresses: #813851.
    * Install app icons again.
  
   -- Matthias Klose <d...@ubuntu.com>  Thu, 25 Feb 2016 12:04:29 +0100
  
  openjdk-8 (8u72-b15-2) unstable; urgency=medium
  
    * Bump the priority for OpenJDK 8 as the default.
    * Stop building jamvm on mips and mipsel, fails to build.
  
   -- Matthias Klose <d...@ubuntu.com>  Fri, 05 Feb 2016 17:31:08 +0100
added:
  debian/JB-jdk-headless.postinst.in
  debian/JB-jdk-headless.preinst.in
  debian/JB-jdk-headless.prerm.in
modified:
  debian/JB-jdk.preinst.in
  debian/JB-policytool.desktop.in
  debian/README.Debian
  debian/changelog
  debian/control
  debian/control.in
  debian/rules


--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8

Your team Debian Java Maintainers is subscribed to branch 
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to 
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== added file 'debian/JB-jdk-headless.postinst.in'
--- debian/JB-jdk-headless.postinst.in	1970-01-01 00:00:00 +0000
+++ debian/JB-jdk-headless.postinst.in	2016-02-25 13:01:31 +0000
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+set -e
+
+multiarch=@multiarch@
+priority=@priority@
+basedir=/@basedir@
+mandir=$basedir/man
+jdiralias=@jdiralias@
+srcext=1.gz
+dstext=1.gz
+jdk_hl_tools='@jdk_hl_tools@'
+
+case "$1" in
+configure)
+    # obsolete tool
+    if update-alternatives --list apt 2>/dev/null; then
+	update-alternatives --remove-all apt || true
+    fi
+
+    if [ -z "$2" ]; then
+	update_alternatives=y
+    fi
+    if [ -n "$multiarch" ] && [ -n "$2" ]; then
+	for i in $jdk_hl_tools; do
+	    if [ -z "$(update-alternatives --list $i 2>/dev/null | grep ^$basedir/)" ]; then
+		update_alternatives=y
+		break
+	    fi
+	done
+    fi
+    if [ "$update_alternatives" != y ] && [ $priority -gt 1060 ]; then
+	for i in $jre_tools; do
+	    oldp=$(update-alternatives --query java | awk -v b=$basedir '/^Alternative:/ && $2~b {p=1} /^Priority:/ && p {print $2; exit}')
+	    if [ -n "$oldp" ] && [ "$oldp" -le 1060 ]; then
+		update_alternatives=y
+		break
+	    fi
+	done
+    fi
+
+    if [ "$update_alternatives" = y ]; then
+    if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then
+	priority=$(expr $priority - 1)
+    fi
+    for i in $jdk_hl_tools; do
+	unset slave1 slave2 || true
+        if [ -e $mandir/man1/$i.$srcext ]; then
+	    slave1="--slave \
+		/usr/share/man/man1/$i.$dstext \
+                $i.$dstext \
+                $mandir/man1/$i.$srcext"
+	fi
+        if false && [ -e $mandir/ja/man1/$i.$srcext ]; then
+	    slave2="--slave \
+		/usr/share/man/ja/man1/$i.$dstext \
+                ${i}_ja.$dstext \
+                $mandir/ja/man1/$i.$srcext"
+	fi
+        update-alternatives \
+            --install \
+            /usr/bin/$i \
+            $i \
+            $basedir/bin/$i \
+            $priority \
+	    $slave1 $slave2
+    done
+    fi # update alternatives
+
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/JB-jdk-headless.preinst.in'
--- debian/JB-jdk-headless.preinst.in	1970-01-01 00:00:00 +0000
+++ debian/JB-jdk-headless.preinst.in	2016-02-25 13:01:31 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+multiarch=@multiarch@
+old_basedir=/usr/lib/jvm/java-7-openjdk
+jdk_hl_tools='apt extcheck idlj jar jarsigner javac javadoc javah javap jdb jhat jinfo jmap jps jrunscript jsadebugd jstack jstat jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc'
+
+case "$1" in
+    upgrade)
+	if [ -n "$multiarch" ] && [ -n "$2" ]; then
+	    for i in $jdk_hl_tools; do
+		if [ -n "$(update-alternatives --list $i 2>/dev/null | grep ^$old_basedir/)" ]; then
+		    update-alternatives --remove $i $old_basedir/bin/$i || true
+		fi
+	    done
+	fi
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/JB-jdk-headless.prerm.in'
--- debian/JB-jdk-headless.prerm.in	1970-01-01 00:00:00 +0000
+++ debian/JB-jdk-headless.prerm.in	2016-02-25 13:01:31 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+set -e
+
+jdk_hl_tools='@jdk_hl_tools@'
+basedir=/@basedir@
+
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    for i in $jdk_hl_tools; do
+	update-alternatives --remove $i $basedir/bin/$i
+    done
+fi
+
+#DEBHELPER#

=== modified file 'debian/JB-jdk.preinst.in'
--- debian/JB-jdk.preinst.in	2014-05-29 08:50:43 +0000
+++ debian/JB-jdk.preinst.in	2016-02-25 13:01:31 +0000
@@ -4,7 +4,7 @@
 
 multiarch=@multiarch@
 old_basedir=/usr/lib/jvm/java-7-openjdk
-jdk_tools='appletviewer apt extcheck idlj jar jarsigner javac javadoc javah javap jconsole jdb jhat jinfo jmap jps jrunscript jsadebugd jstack jstat jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc'
+jdk_tools='appletviewer jconsole'
 
 case "$1" in
     upgrade)

=== modified file 'debian/JB-policytool.desktop.in'
--- debian/JB-policytool.desktop.in	2014-07-01 14:23:02 +0000
+++ debian/JB-policytool.desktop.in	2016-02-25 13:01:31 +0000
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=@vendor@ Java @RELEASE@ Policy Tool
 Name[fi]=@vendor@ Java @RELEASE@ - käytäntötyökalu
+Name[fr]=@vendor@ Java @RELEASE@ - Outil de réglage
 Comment=@vendor@ Java @RELEASE@ Policy Tool
 Comment[fi]=@vendor@ Java @RELEASE@ - käytäntötyökalu
+Comment[fr]=@vendor@ Java @RELEASE@ - Outil de réglage
 Keywords=java;security;policytool
 Exec=/usr/bin/policytool
 Terminal=false

=== modified file 'debian/README.Debian'
--- debian/README.Debian	2014-05-29 08:50:43 +0000
+++ debian/README.Debian	2016-02-25 13:01:31 +0000
@@ -50,8 +50,8 @@
 
 There are two solutions to work around this issue:
 1. mask your window manager as one of the non-reparenting ones supported by AWT,
-   using the wmname <http://tools.suckless.org/wmname> tool from the dwm-tools
-   package:
+   using the wmname <http://tools.suckless.org/wmname> tool from the
+   suckless-tools package:
    $ wmname LG3D
 2. set the environment variable _JAVA_AWT_WM_NONREPARENTING:
    $ export _JAVA_AWT_WM_NONREPARENTING=true

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-23 20:45:24 +0000
+++ debian/changelog	2016-02-25 13:01:31 +0000
@@ -1,3 +1,23 @@
+openjdk-8 (8u72-b15-3) unstable; urgency=medium
+
+  * Split out an openjdk-8-jdk-headless package.
+  * Don't run the tests on Ubuntu xenial (openjdk-8 now in main,
+    jtreg in universe).
+  * Recognize -dcevm as a jvm. Closes: #814421.
+  * Update libgconf/libgnome jre recommendations. Closes: #813943.
+  * Update package reference in README. Closes: #814605.
+  * Add french translation for policytool desktop file. Addresses: #813851.
+  * Install app icons again.
+
+ -- Matthias Klose <d...@ubuntu.com>  Thu, 25 Feb 2016 12:04:29 +0100
+
+openjdk-8 (8u72-b15-2) unstable; urgency=medium
+
+  * Bump the priority for OpenJDK 8 as the default.
+  * Stop building jamvm on mips and mipsel, fails to build.
+
+ -- Matthias Klose <d...@ubuntu.com>  Fri, 05 Feb 2016 17:31:08 +0100
+
 openjdk-8 (8u72-b15-1) unstable; urgency=medium
 
   * Update to 8u72-b15.

=== modified file 'debian/control'
--- debian/control	2015-12-15 07:48:54 +0000
+++ debian/control	2016-02-25 13:01:31 +0000
@@ -18,17 +18,18 @@
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8
 Vcs-Browser: https://code.launchpad.net/~openjdk/openjdk/openjdk8
 
-Package: openjdk-8-jdk
+Package: openjdk-8-jdk-headless
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
 Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}
-Depends: openjdk-8-jre (= ${binary:Version}),
+Depends: openjdk-8-jre-headless (= ${binary:Version}),
   ${shlibs:Depends}, ${misc:Depends}
-Recommends: libxt-dev
-Suggests: openjdk-8-demo, openjdk-8-source, visualvm
-Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk,
-  java7-sdk, java8-sdk, java-compiler
-Description: OpenJDK Development Kit (JDK)
+Suggests: openjdk-8-demo, openjdk-8-source
+Provides: java-sdk-headless, java2-sdk-headless,
+  java5-sdk-headless, java6-sdk-headless,
+  java7-sdk-headless, java8-sdk-headless, java-compiler
+Replaces: openjdk-8-jdk (<< 8u72-b15-4),
+Description: OpenJDK Development Kit (JDK) (headless)
  OpenJDK is a development environment for building applications,
  applets, and components using the Java programming language.
  .
@@ -59,6 +60,24 @@
  The packages are built using the IcedTea build support and patches
  from the IcedTea project.
 
+Package: openjdk-8-jdk
+Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
+Multi-Arch: same
+Pre-Depends: ${dpkg:Depends}
+Depends: openjdk-8-jre (= ${binary:Version}),
+  openjdk-8-jdk-headless (= ${binary:Version}),
+  ${shlibs:Depends}, ${misc:Depends}
+Recommends: libxt-dev
+Suggests: openjdk-8-demo, openjdk-8-source, visualvm
+Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk,
+  java7-sdk, java8-sdk, java-compiler
+Description: OpenJDK Development Kit (JDK)
+ OpenJDK is a development environment for building applications,
+ applets, and components using the Java programming language.
+ .
+ The packages are built using the IcedTea build support and patches
+ from the IcedTea project.
+
 Package: openjdk-8-jre
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
 Multi-Arch: same
@@ -146,7 +165,7 @@
  from the IcedTea project.
 
 Package: openjdk-8-jre-jamvm
-Architecture: amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64 mips mipsel
+Architecture: amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64
 Multi-Arch: same
 Priority: extra
 Pre-Depends: ${dpkg:Depends}

=== modified file 'debian/control.in'
--- debian/control.in	2015-12-12 20:01:27 +0000
+++ debian/control.in	2016-02-25 13:01:31 +0000
@@ -18,17 +18,18 @@
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8
 Vcs-Browser: https://code.launchpad.net/~openjdk/openjdk/openjdk8
 
-Package: @basename@-jdk
+Package: @basename@-jdk-headless
 Architecture: @any_archs@
 Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}
-Depends: @basename@-jre (= ${binary:Version}),
+Depends: @basename@-jre-headless (= ${binary:Version}),
   ${shlibs:Depends}, ${misc:Depends}
-Recommends: libxt-dev
-Suggests: @basename@-demo, @basename@-source, visualvm
-Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk,
-  java7-sdk, java8-sdk, java-compiler
-Description: OpenJDK Development Kit (JDK)
+Suggests: @basename@-demo, @basename@-source
+Provides: java-sdk-headless, java2-sdk-headless,
+  java5-sdk-headless, java6-sdk-headless,
+  java7-sdk-headless, java8-sdk-headless, java-compiler
+Replaces: @basename@-jdk (<< 8u72-b15-4),
+Description: OpenJDK Development Kit (JDK) (headless)
  OpenJDK is a development environment for building applications,
  applets, and components using the Java programming language.
  .
@@ -59,6 +60,24 @@
  The packages are built using the IcedTea build support and patches
  from the IcedTea project.
 
+Package: @basename@-jdk
+Architecture: @any_archs@
+Multi-Arch: same
+Pre-Depends: ${dpkg:Depends}
+Depends: @basename@-jre (= ${binary:Version}),
+  @basename@-jdk-headless (= ${binary:Version}),
+  ${shlibs:Depends}, ${misc:Depends}
+Recommends: libxt-dev
+Suggests: @basename@-demo, @basename@-source, visualvm
+Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk,
+  java7-sdk, java8-sdk, java-compiler
+Description: OpenJDK Development Kit (JDK)
+ OpenJDK is a development environment for building applications,
+ applets, and components using the Java programming language.
+ .
+ The packages are built using the IcedTea build support and patches
+ from the IcedTea project.
+
 Package: @basename@-jre
 Architecture: @any_archs@
 Multi-Arch: same

=== modified file 'debian/rules'
--- debian/rules	2016-01-23 20:45:24 +0000
+++ debian/rules	2016-02-25 13:01:31 +0000
@@ -50,7 +50,7 @@
 # Shark build but just crash
 shark_archs	=
 
-ifneq (,$(filter $(distrel),lucid precise quantal raring saucy trusty utopic lenny etch squeeze wheezy jessie sid))
+ifneq (,$(filter $(distrel),lucid precise quantal raring saucy trusty utopic vivid wily lenny etch squeeze wheezy jessie))
   is_default = no
 else
   is_default = yes
@@ -117,6 +117,7 @@
 ifneq (,$(filter $(DEB_HOST_ARCH), armel))
   with_check = disabled running check on $(DEB_HOST_ARCH)
 endif
+with_check = disabled for this upload
 
 with_docs = $(if $(findstring nodocs, $(DEB_BUILD_OPTIONS)),,yes)
 ifneq (,$(findstring cacao shark, $(PKGSOURCE)))
@@ -151,7 +152,7 @@
 cacao_archs =
 
 ifeq (,$(filter $(distrel),squeeze lucid))
-  jamvm_archs = amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64 mips mipsel
+  jamvm_archs = amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64
 endif
 ifeq (,$(filter $(distrel),wheezy squeeze lucid))
   jamvm_defaults =
@@ -316,7 +317,7 @@
 # FIXME: #, implement a java.time.zone.ZoneRulesProvider
 with_tzdata =
 
-ifneq (,$(filter $(distrel),squeeze wheezy lucid precise))
+ifneq (,$(filter $(distrel),squeeze wheezy lucid precise xenial))
   with_check =
 else
   bd_jtreg = jtreg,
@@ -651,8 +652,11 @@
 jre_tools_alt	= $(filter-out kinit klist ktab, $(jre_tools))
 
 all_jdk_tools	= $(filter-out javaws, $(notdir $(wildcard build/$(sdkimg)/bin/*)))
-jdk_tools	= $(filter-out $(all_jre_tools), $(all_jdk_tools))
-jdk_tools_alt	= $(filter-out apt java-rmi.cgi, $(jdk_tools))
+jdk_tools	= appletviewer jconsole
+jdk_tools_alt	= $(jdk_tools)
+jdk_hl_tools	= $(filter-out $(all_jre_tools) $(jdk_tools), $(all_jdk_tools))
+jdk_hl_tools_alt= $(filter-out apt java-rmi.cgi, $(jdk_hl_tools))
+
 
 # build dependencies
 ifneq (,$(filter $(distrel),lucid precise))
@@ -784,7 +788,11 @@
 dlopen_jre_recommends =
 # these are not yet ready for multiarch
 ifneq (,$(DEB_HOST_MULTIARCH))
-  dlopen_jre_recommends += , libgnome2-0, libgnomevfs2-0, libgconf2-4
+  ifneq (,$(filter $(distrel),jessie wheezy squeeze precise trusty vivid wily))
+    dlopen_jre_recommends += , libgnome-2-0, libgnomevfs2-0, libgconf-2-4
+  else
+    dlopen_jre_recommends += , libgnome2-0, libgnomevfs2-0, libgconf2-4
+  endif
 else
   dlopen_jre_depends += , libgnome2-0, libgnomevfs2-0, libgconf2-4
 endif
@@ -828,6 +836,7 @@
 p_jrec	= $(basename)-jre-cacao
 p_jrej	= $(basename)-jre-jamvm
 p_jrez	= $(basename)-jre-zero
+p_jdkhl	= $(basename)-jdk-headless
 p_jdk	= $(basename)-jdk
 p_demo	= $(basename)-demo
 p_src	= $(basename)-source
@@ -840,6 +849,7 @@
 d_jrec	= debian/$(p_jrec)
 d_jrej	= debian/$(p_jrej)
 d_jrez	= debian/$(p_jrez)
+d_jdkhl	= debian/$(p_jdkhl)
 d_jdk	= debian/$(p_jdk)
 d_demo	= debian/$(p_demo)
 d_src	= debian/$(p_src)
@@ -986,6 +996,7 @@
 	      -e 's/@multiarch@/$(DEB_HOST_MULTIARCH)/g' \
 	      -e 's/@jre_hl_tools@/$(jre_hl_tools_alt)/g' \
 	      -e 's/@jre_tools@/$(jre_tools_alt)/g' \
+	      -e 's/@jdk_hl_tools@/$(jdk_hl_tools_alt)/g' \
 	      -e 's/@jdk_tools@/$(jdk_tools_alt)/g' \
 	      -e 's/@corba_tools@/$(corba_tools)/g' \
 	      -e 's,@j2se_lib@,$(j2se_lib),g' \
@@ -1775,6 +1786,7 @@
 endif
 	: # FIXME: avian working with 8?
 	: # printf -- '-avian KNOWN\n' >> $(d)/$(etcdir)/jvm.cfg
+	printf -- '-dcevm KNOWN\n' >> $(d)/$(etcdir)/jvm.cfg
 
 ifeq (0,1)
 # FIXME: XXX
@@ -1864,15 +1876,47 @@
 	  done; \
 	) >> debian/$(p_jrehl).install
 
-	: # $(p_jdk).install
+	: # $(p_jdkhl).install
 	( \
-	  echo '$(basedir)/include'; \
-	  echo '$(basedir)/lib'; \
+	  cd $(d); \
+	  for i in $(basedir)/include/*.h; do \
+	    case $$i in */jawt.h) continue; esac; \
+	    [ -h $$i ] && continue; \
+	    echo $$i; \
+	  done; \
+	  echo '$(basedir)/include/*/jni_md.h'; \
+	  echo '$(basedir)/lib/jexec'; \
 	  echo '$(basedir)/LICENSE'; \
 	  echo '$(basedir)/ASSEMBLY_EXCEPTION'; \
 	  echo '$(basedir)/THIRD_PARTY_README'; \
+	  for i in $(basedir)/lib/*; do \
+	    case $$i in */jconsole.jar) continue; esac; \
+	    [ -h $$i ] && continue; \
+	    echo $$i; \
+	  done; \
+	  for i in $(basedir)/{bin,man/man1,man/ja_JP.UTF-8/man1}/*; do \
+	    case $$i in */appletviewer*|*/jconsole*) continue; esac; \
+	    [ -h $$i -o "$$i" = $(basedir)/bin/java-rmi.cgi ] && continue; \
+	    echo $$i; \
+	  done; \
+	) > debian/$(p_jdkhl).install
+
+	: # $(p_jdk).install
+	( \
 	  cd $(d); \
+	  for i in $(basedir)/include/*.h; do \
+	    case $$i in */jawt.h) : ;; *) continue; esac; \
+	    [ -h $$i ] && continue; \
+	    echo $$i; \
+	  done; \
+	  echo '$(basedir)/include/*/jawt_md.h'; \
+	  for i in $(basedir)/lib/*; do \
+	    case $$i in */jconsole.jar) : ;; *) continue; esac; \
+	    [ -h $$i ] && continue; \
+	    echo $$i; \
+	  done; \
 	  for i in $(basedir)/{bin,man/man1,man/ja_JP.UTF-8/man1}/*; do \
+	    case $$i in */appletviewer*|*/jconsole*) : ;; *) continue; esac; \
 	    [ -h $$i -o "$$i" = $(basedir)/bin/java-rmi.cgi ] && continue; \
 	    echo $$i; \
 	  done; \
@@ -1981,14 +2025,11 @@
 	cp -p debian/sun_java_app.xpm \
 		$(d_demo)/usr/share/pixmaps/$(basename)-app.xpm
 
-ifeq (0,1)
-# FIXME: not available in 8
 	: # install icons
 	for i in 16 24 32 48; do \
-	  install -D -m 644 -p jdk/src/solaris/classes/sun/awt/X11/java-icon$${i}.png \
+	  install -D -m 644 -p src/jdk/src/solaris/classes/sun/awt/X11/java-icon$${i}.png \
 	    $(d_jre)/usr/share/icons/hicolor/$${i}x$${i}/apps/$(basename).png; \
 	done
-endif
 
 	: # create docdir symlinks for $(p_jrehl)
 	( \
@@ -2015,13 +2056,18 @@
 	  echo usr/share/doc/$(p_jre) usr/share/doc/$(p_src); \
 	) > $(d_src).links
 
+	: # create docdir symlinks for $(p_jdkhl)
+	( \
+	  echo usr/share/doc/$(p_jrehl) usr/share/doc/$(p_jdkhl); \
+	) > $(d_jdkhl).links
+
 	: # create docdir symlinks for $(p_jdk)
 	( \
 	  echo usr/share/doc/$(p_jre) usr/share/doc/$(p_jdk); \
 	) > $(d_jdk).links
 # doesn't work, no package dependency
 ifneq (,$(DEB_HOST_MULTIARCH))
-	  echo '$(TOP)/$(basename)/src.zip $(basedir)/src.zip' >> $(d_jdk).links
+	  echo '$(TOP)/$(basename)/src.zip $(basedir)/src.zip' >> $(d_jdkhl).links
 endif
 
 	: # create docdir symlinks for $(p_dbg)
@@ -2071,6 +2117,7 @@
 
 	@echo JRE_HL_TOOLS: $(jre_hl_tools_alt) jexec
 	@echo JRE_TOOLS: $(jre_tools_alt)
+	@echo JDK_HL_TOOLS: $(jdk_hl_tools_alt)
 	@echo JDK_TOOLS: $(jdk_tools_alt)
 	( \
 	  echo 'name=$(jdirname)'; \
@@ -2085,6 +2132,9 @@
 	  for i in $(jre_tools_alt); do \
 	    echo "jre $$i /$(basedir)/jre/bin/$$i"; \
 	  done; \
+	  for i in $(jdk_hl_tools_alt); do \
+	    echo "jdkhl $$i /$(basedir)/bin/$$i"; \
+	  done; \
 	  for i in $(jdk_tools_alt); do \
 	    echo "jdk $$i /$(basedir)/bin/$$i"; \
 	  done; \

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to