Bug#908898: ublock-origin: debian/watch does not work correctly
Control: tags -1 pending Am 15.09.2018 um 20:26 schrieb Sven Joachim: [...] > Still, the watch file is useful for tracker.debian.org. > >> diff --git a/debian/watch b/debian/watch >> index c0a168727..49d51c087 100644 >> --- a/debian/watch >> +++ b/debian/watch >> @@ -1,3 +1,3 @@ >> version=3 >> opts=repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// \ >> -https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz >> +https://github.com/gorhill/uBlock/releases .*/archive/\d(.*)\.tar\.gz > > Better use the attached version which does not eat the first digit of the > upstream version in ublock-origin_*.orig.tar.gz. Thanks for the report and the patch! Cheers, Markus signature.asc Description: OpenPGP digital signature
Bug#908898: ublock-origin: debian/watch does not work correctly
Control: tags -1 + patch On 2018-09-15 19:18 +0200, Sven Joachim wrote: > On 2018-09-15 18:39 +0200, Sven Joachim wrote: > >> Source: ublock-origin >> Version: 1.16.14+dfsg-2 >> >> The regex used in debian/watch is too simplistic, upstream has made >> releases for legacy Firefox versions which uscan prefers now: >> >> Obviously this is not what we want, since this is not the latest version >> (and not even a valid version). This particular problem should be easy >> to fix, > > See the attached minimal patch. Wow, I still managed to botch it. :-( >> but versions like 1.16.21b7 and 1.16.21rc0 also need some >> mangling to turn them into 1.16.21~b7 and 1.16.21~rc0, respectively. > > Looking at the list of tags, betas and release candidates always seem > have an odd last number, while releases have an even one. So maybe this > is not really important after all, as the next stable upstream version > will be 1.16.22 and not 1.16.21. Moreover the upstream tarball is not used anyway, as there are files lacking in it, which I found out after reading debian/README.source. Following the recipe there I was able to actually make a local package of ublock-origin 1.16.21rc0, although that involved more manual steps than I would have liked. Still, the watch file is useful for tracker.debian.org. > diff --git a/debian/watch b/debian/watch > index c0a168727..49d51c087 100644 > --- a/debian/watch > +++ b/debian/watch > @@ -1,3 +1,3 @@ > version=3 > opts=repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// \ > -https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz > +https://github.com/gorhill/uBlock/releases .*/archive/\d(.*)\.tar\.gz Better use the attached version which does not eat the first digit of the upstream version in ublock-origin_*.orig.tar.gz. Cheers, Sven diff --git a/debian/watch b/debian/watch index c0a168727..78c3eba69 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// \ -https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz +https://github.com/gorhill/uBlock/releases .*/archive/(\d.*)\.tar\.gz
Bug#908898: ublock-origin: debian/watch does not work correctly
On 2018-09-15 18:39 +0200, Sven Joachim wrote: > Source: ublock-origin > Version: 1.16.14+dfsg-2 > > The regex used in debian/watch is too simplistic, upstream has made > releases for legacy Firefox versions which uscan prefers now: > > , > | $ uscan --verbose > | uscan info: uscan (version 2.18.4) See uscan(1) for help > | uscan info: Scan watch files in . > | uscan info: Check debian/watch and debian/changelog in . > | uscan info: package="ublock-origin" version="1.16.14+dfsg-2" (as seen in > debian/changelog) > | uscan info: package="ublock-origin" version="1.16.14+dfsg" (no > epoch/revision) > | uscan info: ./debian/changelog sets package="ublock-origin" > version="1.16.14+dfsg" > | uscan info: Process watch file at: debian/watch > | package = ublock-origin > | version = 1.16.14+dfsg > | pkg_dir = . > | uscan info: opts: > repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// > | uscan info: line: https://github.com/gorhill/uBlock/releases > .*/archive/(.*)\.tar\.gz > | uscan info: Parsing repacksuffix=+dfsg > | uscan info: Parsing dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// > | uscan info: line: https://github.com/gorhill/uBlock/releases > .*/archive/(.*)\.tar\.gz > | uscan info: Last orig.tar.* tarball version (from debian/changelog): > 1.16.14+dfsg > | uscan info: Last orig.tar.* tarball version (dversionmangled): 1.16.14 > | uscan info: Requesting URL: > |https://github.com/gorhill/uBlock/releases > | uscan info: Matching pattern: > | > (?:(?:https://github.com)?\/gorhill\/uBlock\/releases)?.*/archive/(.*)\.tar\.gz > | uscan info: Found the following matching hrefs on the web page (newest > first): > |/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz > (firefox-legacy-1.16.4.4) index=firefox-legacy-1.16.4.4-1 > |/gorhill/uBlock/archive/firefox-legacy-1.16.4.3.tar.gz > (firefox-legacy-1.16.4.3) index=firefox-legacy-1.16.4.3-1 > |/gorhill/uBlock/archive/firefox-legacy-1.16.4.2.tar.gz > (firefox-legacy-1.16.4.2) index=firefox-legacy-1.16.4.2-1 > |/gorhill/uBlock/archive/1.16.21rc0.tar.gz (1.16.21rc0) > index=1.16.21rc0-1 > |/gorhill/uBlock/archive/1.16.21b7.tar.gz (1.16.21b7) index=1.16.21b7-1 > |/gorhill/uBlock/archive/1.16.20.tar.gz (1.16.20) index=1.16.20-1 > |/gorhill/uBlock/archive/1.16.18.tar.gz (1.16.18) index=1.16.18-1 > |/gorhill/uBlock/archive/1.16.16.tar.gz (1.16.16) index=1.16.16-1 > |/gorhill/uBlock/archive/1.16.14.tar.gz (1.16.14) index=1.16.14-1 > |/gorhill/uBlock/archive/1.16.12.tar.gz (1.16.12) index=1.16.12-1 > | uscan info: Looking at $base = https://github.com/gorhill/uBlock/releases > with > | $filepattern = .*/archive/(.*)\.tar\.gz found > | $newfile = /gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz > | $newversion = firefox-legacy-1.16.4.4 which is newer than > | $lastversion = 1.16.14+dfsg > | uscan info: Matching target for downloadurlmangle: > https://github.com/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz > | uscan info: Upstream URL(+tag) to download is identified as > https://github.com/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz > | uscan info: Filename (filenamemangled) for downloaded file: > firefox-legacy-1.16.4.4.tar.gz > | uscan: Newest version of ublock-origin on remote site is > firefox-legacy-1.16.4.4, local version is 1.16.14+dfsg > | (mangled local version is 1.16.14) > | uscan:=> Newer package available from > | > https://github.com/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz > ` > > Obviously this is not what we want, since this is not the latest version > (and not even a valid version). This particular problem should be easy > to fix, See the attached minimal patch. > but versions like 1.16.21b7 and 1.16.21rc0 also need some > mangling to turn them into 1.16.21~b7 and 1.16.21~rc0, respectively. Looking at the list of tags, betas and release candidates always seem have an odd last number, while releases have an even one. So maybe this is not really important after all, as the next stable upstream version will be 1.16.22 and not 1.16.21. Cheers, Sven diff --git a/debian/watch b/debian/watch index c0a168727..49d51c087 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// \ -https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz +https://github.com/gorhill/uBlock/releases .*/archive/\d(.*)\.tar\.gz
Bug#908898: ublock-origin: debian/watch does not work correctly
Source: ublock-origin Version: 1.16.14+dfsg-2 The regex used in debian/watch is too simplistic, upstream has made releases for legacy Firefox versions which uscan prefers now: , | $ uscan --verbose | uscan info: uscan (version 2.18.4) See uscan(1) for help | uscan info: Scan watch files in . | uscan info: Check debian/watch and debian/changelog in . | uscan info: package="ublock-origin" version="1.16.14+dfsg-2" (as seen in debian/changelog) | uscan info: package="ublock-origin" version="1.16.14+dfsg" (no epoch/revision) | uscan info: ./debian/changelog sets package="ublock-origin" version="1.16.14+dfsg" | uscan info: Process watch file at: debian/watch | package = ublock-origin | version = 1.16.14+dfsg | pkg_dir = . | uscan info: opts: repacksuffix=+dfsg,dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// | uscan info: line: https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz | uscan info: Parsing repacksuffix=+dfsg | uscan info: Parsing dversionmangle=s/\+(repack|dfsg|ds|deb)\d*$// | uscan info: line: https://github.com/gorhill/uBlock/releases .*/archive/(.*)\.tar\.gz | uscan info: Last orig.tar.* tarball version (from debian/changelog): 1.16.14+dfsg | uscan info: Last orig.tar.* tarball version (dversionmangled): 1.16.14 | uscan info: Requesting URL: |https://github.com/gorhill/uBlock/releases | uscan info: Matching pattern: | (?:(?:https://github.com)?\/gorhill\/uBlock\/releases)?.*/archive/(.*)\.tar\.gz | uscan info: Found the following matching hrefs on the web page (newest first): |/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz (firefox-legacy-1.16.4.4) index=firefox-legacy-1.16.4.4-1 |/gorhill/uBlock/archive/firefox-legacy-1.16.4.3.tar.gz (firefox-legacy-1.16.4.3) index=firefox-legacy-1.16.4.3-1 |/gorhill/uBlock/archive/firefox-legacy-1.16.4.2.tar.gz (firefox-legacy-1.16.4.2) index=firefox-legacy-1.16.4.2-1 |/gorhill/uBlock/archive/1.16.21rc0.tar.gz (1.16.21rc0) index=1.16.21rc0-1 |/gorhill/uBlock/archive/1.16.21b7.tar.gz (1.16.21b7) index=1.16.21b7-1 |/gorhill/uBlock/archive/1.16.20.tar.gz (1.16.20) index=1.16.20-1 |/gorhill/uBlock/archive/1.16.18.tar.gz (1.16.18) index=1.16.18-1 |/gorhill/uBlock/archive/1.16.16.tar.gz (1.16.16) index=1.16.16-1 |/gorhill/uBlock/archive/1.16.14.tar.gz (1.16.14) index=1.16.14-1 |/gorhill/uBlock/archive/1.16.12.tar.gz (1.16.12) index=1.16.12-1 | uscan info: Looking at $base = https://github.com/gorhill/uBlock/releases with | $filepattern = .*/archive/(.*)\.tar\.gz found | $newfile = /gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz | $newversion = firefox-legacy-1.16.4.4 which is newer than | $lastversion = 1.16.14+dfsg | uscan info: Matching target for downloadurlmangle: https://github.com/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz | uscan info: Upstream URL(+tag) to download is identified as https://github.com/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz | uscan info: Filename (filenamemangled) for downloaded file: firefox-legacy-1.16.4.4.tar.gz | uscan: Newest version of ublock-origin on remote site is firefox-legacy-1.16.4.4, local version is 1.16.14+dfsg | (mangled local version is 1.16.14) | uscan:=> Newer package available from | https://github.com/gorhill/uBlock/archive/firefox-legacy-1.16.4.4.tar.gz ` Obviously this is not what we want, since this is not the latest version (and not even a valid version). This particular problem should be easy to fix, but versions like 1.16.21b7 and 1.16.21rc0 also need some mangling to turn them into 1.16.21~b7 and 1.16.21~rc0, respectively.
