Merge ~vpa1977/ubuntu/+source/openjdk-20:02_security_release_update_watch into ubuntu/+source/openjdk-20:ubuntu/devel

[Vladimir Petko]

Please do not merge, this merge proposal is a part in the series [1][2][3][4]:

Summary of changes:
 - update debian/watch to use security release version format

PPA: ppa:vpa1977/openjdk-20-april[5]

Testing:
 - uscan works
----------------cut-----------------------------------
$ uscan -v
uscan info: uscan (version 2.23.4ubuntu1) See uscan(1) for help
uscan info: Scan watch files in .
uscan info: Check debian/watch and debian/changelog in .
uscan info: package="openjdk-20" version="20.0.1+9~us1-0ubuntu1~ppa2" (as seen in debian/changelog)
uscan info: package="openjdk-20" version="20.0.1+9~us1" (no epoch/revision)
uscan info: ./debian/changelog sets package="openjdk-20" version="20.0.1+9~us1"
uscan info: Process watch file at: debian/watch
    package = openjdk-20
    version = 20.0.1+9~us1
    pkg_dir = .
uscan info: opts: repack,compression=xz,repacksuffix=~us1,dversionmangle=s/\~us\d*$//,
uscan info: line: https://github.com/openjdk/jdk20u/tags (?:.*?/)?jdk-(20\.\d+\.\d+\+\d+)\.tar\.gz
uscan info: Parsing repack
uscan info: Parsing compression=xz
uscan info: Parsing repacksuffix=~us1
uscan info: Parsing dversionmangle=s/\~us\d*$//
uscan info: line: https://github.com/openjdk/jdk20u/tags (?:.*?/)?jdk-(20\.\d+\.\d+\+\d+)\.tar\.gz
uscan info: Last orig.tar.* tarball version (from debian/changelog): 20.0.1+9~us1
uscan info: Last orig.tar.* tarball version (dversionmangled): 20.0.1+9
uscan info: Requesting URL:
   https://github.com/openjdk/jdk20u/tags
uscan info: Matching pattern:
   (?:(?:https://github.com)?\/openjdk\/jdk20u\/)?(?:.*?/)?jdk-(20\.\d+\.\d+\+\d+)\.tar\.gz
uscan info: Found the following matching hrefs on the web page (newest first):
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+9.tar.gz (20.0.1+9) index=20.0.1+9-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+9.tar.gz (20.0.1+9) index=20.0.1+9-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+8.tar.gz (20.0.1+8) index=20.0.1+8-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+8.tar.gz (20.0.1+8) index=20.0.1+8-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+7.tar.gz (20.0.1+7) index=20.0.1+7-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+7.tar.gz (20.0.1+7) index=20.0.1+7-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+6.tar.gz (20.0.1+6) index=20.0.1+6-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+6.tar.gz (20.0.1+6) index=20.0.1+6-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+5.tar.gz (20.0.1+5) index=20.0.1+5-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+5.tar.gz (20.0.1+5) index=20.0.1+5-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+4.tar.gz (20.0.1+4) index=20.0.1+4-1
   https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+4.tar.gz (20.0.1+4) index=20.0.1+4-1
uscan info: Looking at $base = https://github.com/openjdk/jdk20u/tags with
    $filepattern = (?:.*?/)?jdk-(20\.\d+\.\d+\+\d+)\.tar\.gz found
    $newfile = https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+9.tar.gz
    $newversion = 20.0.1+9
    $lastversion = 20.0.1+9
uscan info: Matching target for downloadurlmangle: https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+9.tar.gz
uscan info: Upstream URL(+tag) to download is identified as https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+9.tar.gz
uscan info: Filename (filenamemangled) for downloaded file: jdk-20.0.1+9.tar.gz
uscan info: Newest version of openjdk-20 on remote site is 20.0.1+9, local version is 20.0.1+9
            (mangled local version is 20.0.1+9)
uscan info: => Package is up to date from:
             => https://github.com/openjdk/jdk20u/archive/refs/tags/jdk-20.0.1+9.tar.gz
uscan info: Scan finished

------------------------------cut---------------------------------------

[1] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/442093
[2] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/442097
[3] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/442098
[4] https://code.launchpad.net/~vpa1977/ubuntu/+source/openjdk-20/+git/openjdk-20/+merge/442099
[5] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-20-april

diff --git a/debian/changelog b/debian/changelog
index 9c2e9d0..1424525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openjdk-20 (20.0.1+9~us1-0ubuntu1) UNRELEASED; urgency=medium
     - Release notes:
       TODO: waiting for announcement
   * d/p/*: refresh patches.
+  * d/watch: update version format for the security release.
 
  -- Vladimir Petko <[e-mail]>  Thu, 20 Apr 2023 15:22:10 +1200
 
diff --git a/debian/watch b/debian/watch
index df02722..9ae03b0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,5 +3,5 @@ opts=\
 repack,\
 compression=xz,\
 repacksuffix=~us1,\
-dversionmangle=s/~\d*\~us\d*$/\+\d*/,\
-https://github.com/openjdk/jdk20u/tags (?:.*?/)?jdk-(20\+\d+)\.tar\.gz
+dversionmangle=s/\~us\d*$//, \
+https://github.com/openjdk/jdk20u/tags (?:.*?/)?jdk-(20\.\d+\.\d+\+\d+)\.tar\.gz