Re: How to handle file removals from upstream releases?

[Otto Kekäläinen <otto@debian.org>]

On Sat, 4 Jan 2025 at 22:19, Otto Kekäläinen <otto@debian.org> wrote:
>
> Hi,
>
> Personally I use Files-Excluded in the d/copyright file and import
> with gbp import-orig which handles everything automatically correctly
> assuming the d/gbp.conf is configured correctly and has the
> upstream-vcs-tag format so gbp can do the git merge. See the gbp.conf
> template I suggest all packages should use in
> https://github.com/Debian/dh-make-golang/pull/225
>
> No need to manually fiddle with any other commands.

I am not sure what you have on your local computer right now, so and
also my PRs to improve the DEP-14 defaults to 2024 level have not been
merged yet, so here are the steps I think should work for you that
uses the dev version of dh-make-golang which configured gbp.conf
almost correctly and the import commands to run:

cd $(mktemp -d)
curl -LO https://salsa.debian.org/otto/dh-make-golang/-/jobs/6866388/artifacts/raw/debian/output/dh-make-golang_0.7.0-1+salsaci+20250105+18_amd64.deb
apt install --yes ./dh-make-golang_0.7.0-1+salsaci*
# do initial semi-automated import and repo setup
dh-make-golang make -dep14 -git_revision v1.0.9 -type program
-upstream_git_history -wrap-and-sort ast github.com/cilium/pwru
cd pwru
# save the newly created but uncommitted debian/
git add debian
# the defaults are already correct, including "Files-Excluded: vendor"
in d/copyright
git commit --amend -m "Initial Debian packaging as created by dh-make-golang"
# delete gh-make-golang autocreated upstream tag as we want to re-import it
git tag -d upstream/1.0.9

# Finally, force the initial import to run again so uscan filters the version

# gbp import-orig --upstream-vcs-tag=v1.0.9 --upstream-version=1.0.9 --uscan
gbp:info: Launching uscan...
Newest version of pwru on remote site is 1.0.9, specified download
version is 1.0.9
Successfully repacked ../pwru-1.0.9.tar.gz as
../pwru_1.0.9+ds1.orig.tar.xz, deleting 791 files from it.
gbp:info: Using uscan downloaded tarball ../pwru_1.0.9+ds1.orig.tar.xz
gbp:info: Importing '../pwru_1.0.9+ds1.orig.tar.xz' to branch
'upstream/latest'...
gbp:info: Source package is pwru
gbp:info: Upstream version is 1.0.9
gbp:info: Replacing upstream source on 'debian/latest'
gbp:info: Successfully imported version 1.0.9 of ../pwru_1.0.9.orig.tar.xz

# find vendor
find: 'vendor': No such file or directory