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