Accept upstream-style tags without an epoch

See merge request !5

Epochs are a packaging thing rather than an upstream thing, and version
numbers should be unique even after removing the epoch (epochs are for
ordering, not uniqueness), so we shouldn't require them in upstream
tags. If the package is version 1:1.2.3, look for tags 1%1.2.3 and
v1%1.2.3 (as we did before), plus 1.2.3 and v1.2.3 (new).

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

This also exercises the presence and absence of --release, which I
hadn't tried yet.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

This has no practical effect, but makes more conceptual sense.

Signed-off-by: Simon McVittie <smcv@collabora.com>

deb-git-version-gen: Handle switching from non-native to native

See merge request !3

When a non-native package is converted to be a native one, we need to
ensure that the snapshot version does not contain a debian revision.

For instance, on a package moving from 0.1706.0-0co4 to 0.2020.1 in
three commits, the final output changes like this:

    from: 0.2020.1~0.1706.0+3+g9c3c6b273f11-0co4
    to:   0.2020.1~0.1706.0+0co4+3+g9c3c6b273f11

To be read as "prerelease of 0.2020.1, consisting of 0.1706.0-0co4 plus 3
more commits, the last of which is 9c3c6b273f11".

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

It breaks pristine-tar, and probably doesn't help a great deal with
the tarball size.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

If we do a packaging-only revision of a package because only the
debian/ directory has changed, it requires us to have an orig tarball,
a pristine-tar branch or the ability to download the orig tarball with
`apt-get source`, all of which are unexpected when we are behaving like
the upstream developer.

Add an --auto-upstream option that reverts to the old behaviour
of --upstream.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

This lets you run "python3.5 /path/to/deb-build-snapshot ..." on a
system where python3 is older than that, and have the right thing happen.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

The "upstream" build potentially uses an embedded code copy, for example
via Meson fallback wrap.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Only look for unadorned or v1.2-style tags if we are doing an upstream
release.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

I've renamed the option to --vendor since that is the DEP-14 term,
with --distro as an alias.

Sjoerd clarified out-of-band that the problematic case for matching
'*/1.2-3' is when there are tags 'debian/1.2-3' and 'apertis/1.2-3',
but they do not necessarily point to the same commit, because the
Apertis packaging might modify files like debian/gbp.conf to
accommodate CI.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Previously they were only accepted for non-native packages for which
we are the upstream.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

Signed-off-by: Simon McVittie <smcv@collabora.com>

For Apertis for packages derived from Debian we tag the version as
imported form debian with debian/version. While the apertis derivative
are tagged apertis/version.

Add an option to set the distribution to base the version on to cope
with this situation.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>