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

[Vladimir Petko]

Please do not merge, this merge proposal is a part of a series [1][2][3].

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

Testing:
uscan -ddd
sed -i 's/jdk-11.0.18+10/jdk-11.0.19+5/g' debian/rules
make -f debian/rules get-orig

cd ..
tar xvf openjdk-lts_11.0.19~5~us1.orig.tar.xz

# not a typo - current packaging uses debian/changelog version for the tarball name
tar xvf openjdk-lts_11.0.18+10.orig.tar.gz

diff -r openjdk-11-11.0.18+10/ jdk11u-jdk-11.0.19-5/
$
# no differences should be found

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/439014
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/439016
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-lts/+git/openjdk-lts/+merge/439029
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-new-repack

[Dan Bungert (dbungert)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b4cabb7..dca0e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openjdk-lts (11.0.18+10-0ubuntu4) UNRELEASED; urgency=medium
       hotspot-disable-exec-shield-workaround.diff.
     - generated-headers.patch: include is already added by openjdk makefile.
     - parallel-build-fix.diff: include is not necessary.
+  * d/copyright, d/watch: implement uscan repackaging (LP: #2011749).
 
  -- Vladimir Petko <[e-mail]>  Thu, 16 Mar 2023 08:39:50 +1300
 
diff --git a/debian/copyright b/debian/copyright
index a0c3bde..ca1d74a 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,14 +43,14 @@ Copyright:
 
 OpenJDK:
     Copyright © 1996-2007 Sun Microsystems, Inc.
-    Copyright © 1996-2022 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.
     Portions Copyright © 1999-2005 The Apache Software Foundation.
 
 Packaging:
-    Copyright © 2007-2022 Canonical Ltd.
+    Copyright © 2007-2023 Canonical Ltd.
 
 ------------------------------------------------------------------------------
 License:
diff --git a/debian/rules b/debian/rules
index b012c83..f32fa38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,7 @@ else
 endif
 jvmver		= 1.11.0
 shortver	= 11
-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
@@ -1856,7 +1856,7 @@ endif
 
 is_release		= yes
 git_project		= jdk11u
-git_tag			= jdk-11.0.16+8
+git_tag			= jdk-11.0.18+10
 package_version		= $(subst jdk-,,$(git_tag))
 package_version		= $(shell echo $(PKGVERSION) | sed 's/-[^-][^-]*$$//')
 ifneq ($(is_release),yes)
diff --git a/debian/watch b/debian/watch
index af7b83f..3f07386 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/jdk11u/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/jdk11u/tags \
+   (?:.*?/)?jdk-(\d[\d.]*\+\d[\d]*)\.tar\.gz