openjdk team mailing list archive

[Thorsten Glaser <tg@xxxxxxxxx>]

Source: openjdk-8
Version: 8u212-b01-1
Severity: wishlist
Tags: patch

Hi doko,

I’ve rebuilt the latest openjdk-8 on precise/trusty/xenial and
wheezy/jessie (seeing you’re providing the newer releases with
updates already) and found two issues (besides the testsuite
taking ages or JAVA_HOME not being set for older jtreg):

• @bd_cross@ can evaluate to empty, causing an empty line to
  appear within the first d/control paragraph, causing breakage

• dpkg-parsechangelog --show-field is not universally supported


The following diff fixes those issues:

  * Put @bd_cross@ onto same line as @bd_nss@ in d/control.in (can be empty)
  * Determine source date using backwards-compatible dpkg-parsechangelog call

--- openjdk-8-8u212-b01/debian/control.in	2019-03-17 17:08:10.000000000 +0100
+++ openjdk-8-8u212-b01/debian/control.in	2019-03-21 15:49:23.000000000 +0100
@@ -14,8 +14,7 @@
   @bd_openjdk@
   @bd_zero@ @bd_shark@
   @bd_syslibs@ @bd_pulsejava@ @bd_systemtap@
-  @bd_nss@
-  @bd_cross@
+  @bd_nss@ @bd_cross@
 Standards-Version: 4.3.0
 Homepage: http://openjdk.java.net/
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8
--- openjdk-8-8u212-b01/debian/rules	2019-03-18 14:24:20.000000000 +0100
+++ openjdk-8-8u212-b01/debian/rules	2019-03-21 18:16:31.000000000 +0100
@@ -1970,7 +1971,7 @@
 hg_tag_aarch32		= jdk8u202-b08-aarch32-190124
 hg_url_aarch32		= http://hg.openjdk.java.net/aarch32-port/$(hg_project_aarch32)
 origdir			= ../openjdk-8-$(package_version).orig
-source_date		:= $(shell dpkg-parsechangelog --show-field=Date)
+source_date		:= $(shell dpkg-parsechangelog | sed -n '/^Date: /{s///p;q;}')
 fetch-orig:
 	mkdir -p $(origdir)
 	wget -O $(origdir)/root.tar.bz2 $(hg_url)/archive/$(hg_tag).tar.bz2


Development of this patch was sponsored by ⮡ tarent and its customers.