On Thu, Nov 07, 2024 at 03:04:13PM +0000, Colin Watson wrote: > On Thu, Nov 07, 2024 at 11:41:28AM +0100, Guillem Jover wrote: > > But I'm thinking that, perhaps the best option is to ask upstream > > directly, whether they are going to release a 2.1.x release soon, or > > if they could do that now, and/or whether they could perhaps > > remove/rename the git tag perhaps (with the implied issues with messing > > with history and git tags being sticky on cloned repos)? As I assume > > other downstreams might be in the same/similar situation? > > Indeed. I've filed https://github.com/explosion/catalogue/issues/74 > asking if they're willing to help out here.
Upstream hasn't responded yet, so I'm going to do the ugly uscan hack for now: diff --git a/debian/watch b/debian/watch index f75b80b..fe03f69 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=4 -opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ - https://github.com/explosion/catalogue/tags (?:.*?/)?v?@ANY_VERSION@\.tar\.gz +opts="uversionmangle=s/(2\.0\..*)/2.1.0+really$1/,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ + https://github.com/explosion/catalogue/tags (?:.*?/)?v?(?!2\.1\.0)(\d[\-+\.:\~\d]*)\.tar\.gz After a bit more digging, I did manage to track down why this happened in the first place: upstream initially moved some configuration handling from python-thinc to python-catalogue (using the Debian source package names here for clarity), but that apparently "[caused] some issues with other dependencies" (https://github.com/explosion/thinc/issues/408) and they ended up creating python-confection instead. That's packaged in Debian and it doesn't look as though our python-thinc package needs the functionality that was removed from python-catalogue, so it should be safe for me to go ahead with the +really hack here. -- Colin Watson (he/him) [cjwat...@debian.org]
