Re: gbp import-orig --uscan for the non-trivial cases
Hi,
On Thu, Aug 28, 2025 at 11:08:29AM +0100, Ahmad Khalifa wrote:
On 28/08/2025 08:58, Marc Haber wrote:
On Wed, Aug 27, 2025 at 08:04:33PM +0100, Ahmad Khalifa wrote:
Where is the repo where you get the gbp-import-orig error? I could
try that.
I pushed the branch with the new debian/watch file to wip/watchfile
in the salsa repo on git@salsa.debian.org:debian/sniproxy.git
Short version,
- your d/changelog is newer than anything upstream and uscan is
rightly refusing to play.
That was the key to the thing. I didn't spot this. But it is already in
the debug output. Sometimes you don't see the solution that is right
before your eyes
- uscan's default git versioning is "0.0~git%cd.%h" so that's also
lower than 0.6.1, so prefix pretty with 0.6.1 at least.
That's why my original version mangled the version to
0.6.2~git-somethin, but of course your variant is way prettier. One can
express that in v5 as well.
Also, the second stanza in the watch file is contraproductive, I had to
remove it. I will file a wishlist bug against uscan to allow this.
For documentation. the working version 5 watch file is:
| Version: 5
|
| Source: https://github.com/dlundquist/sniproxy.git
| Matching-Pattern: HEAD
| Mode: git
| Pretty: 0.6.1+git%cd
this will probably only work with the corresponding debian/gbp.conf:
| [DEFAULT]
| debian-branch = debian/latest
| upstream-branch = upstream/latest
| pristine-tar = True
| upstream-signatures = off
| postimport = dch -v %(version)s "New upstream release"
| spawn-editor = always
| interactive = False
| dch-opt = --vendor=debian
caveat: version 4 needs version=4 with an equals sign and a lower case
v, or it'll fall back to an even older version.
$ gbp clone git@salsa.debian.org:debian/sniproxy.git
$ git checkout -t origin/wip/watchfile
$ uscan -v
My uscan doesn't understand v5, change to v4 with 'pretty' and using
0.6.1 prefix as upstream.
It is probably a good idea to work at least in a Debian unstable
container for the latest toolchain.
Even pristine-tar, but I never use that.
pristine-tar is actually useless when you don't have a genuine upstream
tarball. I still have it out of habit and I recall that there were
movements to deprecate or even remove it u
Thank you for helping with sniproxy.
Greetings
Marc
--
-----------------------------------------------------------------------------
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421
Reply to: