Merge ~vpa1977/ubuntu/+source/openjdk-17:lp2011749-repack into ubuntu/+source/openjdk-17:ubuntu/devel

[Vladimir Petko]

Please do not merge, this MP is part of the series [1][2][3]

Summary of changes:
 * d/copyright, d/watch: implement uscan repackaging (LP: #2011749).

PPA: ppa:vpa1977/openjdk-new-repack [4]

Testing:

uscan -ddd
sed -i 's/jdk-17.0.6+10/jdk-17.0.7+5/g' debian/rules
make -f debian/rules get-orig

cd ..
tar xvf openjdk-17_17.0.7+5~us1.orig.tar.xz

# not a typo - current packaging uses debian/changelog version for the tarball name
tar xvf openjdk-17_17.0.6+10.orig.tar.xz

diff -r openjdk-17-17.0.6+10/ jdk17u-jdk-17.0.7-5/
# current packaging for openjdk-17 does not strip bundled lcms library
----------------------------cut------------------------------------------------
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsalpha.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmscam02.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmscgats.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmscnvrt.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmserr.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsgamma.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsgmt.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmshalf.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsintrp.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsio0.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsio1.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmslut.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsmd5.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsmtrx.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsnamed.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsopt.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmspack.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmspcs.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsplugin.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsps2.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmssamp.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmssm.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmstypes.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsvirt.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmswtpnt.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: cmsxform.c
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: lcms2.h
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: lcms2_internal.h
Only in openjdk-17-17.0.6+10/src/java.desktop/share/native/liblcms: lcms2_plugin.h
----------------------------cut------------------------------------------------
Package build with the repacked sources must succeed [4]

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/439093
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/439105
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-17/+git/openjdk-17/+merge/439104
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-new-repack
[5] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-new-repack/+sourcepub/14557399/+listing-archive-extra

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index aa26da9..fd2d0d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openjdk-17 (17.0.6+10-1ubuntu2) UNRELEASED; urgency=medium
     - workaround_expand_exec_shield_cs_limit.diff: obsoleted by
       hotspot-disable-exec-shield-workaround.diff.
     - generated-headers.patch: include is already added by openjdk makefile.
+  * d/copyright, d/watch: implement uscan repackaging (LP: #2011749).
 
  -- Vladimir Petko <[e-mail]>  Thu, 16 Mar 2023 15:04:36 +1300
 
diff --git a/debian/copyright b/debian/copyright
index cee94eb..ebf95e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,27 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Files-Excluded:
+  .github/*
+  .gitattributes
+  src/java.desktop/share/native/liblcms/cms*.c
+  src/java.desktop/share/native/liblcms/lcms2*.h
+  src/java.base/share/native/libzip/zlib/*
+  src/java.desktop/share/native/libsplashscreen/giflib/*
+  src/java.desktop/share/native/libsplashscreen/libpng/*
+  src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/*
+  src/java.desktop/share/native/libjavajpeg/jc*
+  src/java.desktop/share/native/libjavajpeg/jd*
+  src/java.desktop/share/native/libjavajpeg/je*
+  src/java.desktop/share/native/libjavajpeg/jf*
+  src/java.desktop/share/native/libjavajpeg/ji*.c
+  src/java.desktop/share/native/libjavajpeg/jm*
+  src/java.desktop/share/native/libjavajpeg/jpegi*
+  src/java.desktop/share/native/libjavajpeg/jpeglib.h
+  src/java.desktop/share/native/libjavajpeg/jq*
+  src/java.desktop/share/native/libjavajpeg/jv*
+  src/java.desktop/share/native/libjavajpeg/ju*
+  src/java.desktop/share/native/libjavajpeg/README
+Comment: Exclude bundled library sources, Github Actions and git attributes.
+
 This package was debianized by Matthias Klose <[e-mail]> on
 Wed, 08 Aug 2007 15:55:39 +0200.
 
@@ -19,7 +43,7 @@ Copyright:
 
 OpenJDK:
     Copyright © 1996-2007 Sun Microsystems, Inc.
-    Copyright © 1996-2021 Oracle and/or its affiliates.
+    Copyright © 1996-2023 Oracle and/or its affiliates.
     For third party copyrights see below (copies from the third party readme).
     Portions Copyright © 1993-2014 IBM Corp.
     Portions Copyright © 1997 Eastman Kodak Company.
@@ -36,7 +60,7 @@ Java Access Bridge:
     Portions Copyright © 2002-2007 Darren Kenny <[e-mail]>
 
 Packaging:
-    Copyright © 2007-2021 Canonical Ltd.
+    Copyright © 2007-2023 Canonical Ltd.
 
 ------------------------------------------------------------------------------
 License:
diff --git a/debian/rules b/debian/rules
index 3b5ba9b..bd64964 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ else
 endif
 jvmver		= 1.17.0
 shortver	= 17
-v_debian	:= $(shell echo $(PKGVERSION) | sed 's/ea//')
+v_debian	:= $(shell echo $(PKGVERSION) | sed 's/ea//' | sed 's/\~us[[:digit:]]\+//')
 v_upstream	:= $(shell echo $(v_debian) | sed 's/-[^-][^-]*$$//')
 v_pkgrel	:= $(shell echo $(v_debian) | sed 's/^.*-//')
 # FIXME. currently v_upstream like 11~4
diff --git a/debian/watch b/debian/watch
index ea6b16e..cebff53 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,8 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?jdk-(\d[\d.]*\+\d[\d]*)\.tar\.gz%<project>-$1.tar.gz%, dversionmangle=s/~/+/" \
-   https://github.com/openjdk/jdk17u/tags \
-   (?:.*?/)?jdk-(\d[\d.]*\+\d[\d]*)\.tar\.gz debian uupdate
+opts=\
+repack,\
+compression=xz,\
+repacksuffix=~us1,\
+dversionmangle=s/~\d*\~us\d*$/\+\d*/, \
+ https://github.com/openjdk/jdk17u/tags \
+   (?:.*?/)?jdk-(\d[\d.]*\+\d[\d]*)\.tar\.gz