Skip to content

Initial debian packaging v2

Ahmad Khalifa requested to merge debian-wip-v2 into debian/latest

This MR is a squashed version of !1 (closed) that moves all later commits into the first "draft debian packaging" one, leaving upstream import and a final d/changelog commit (total 3)

The reason to have 3 commits is that the first "draft" one has to setup gbp/uscan to include the MUT components. This is done by having:

  • d/changelog at a lower-than-latest version (0.7.0+ds1)
  • d/copyright with Files-Excluded to apply to 0.7.1
  • d/gbp.conf specifying all MUT components and turning on pristine-tar. This is needed before gbp import-orig so that the first run imports mod-* dirs into debian and upstream branches. Also need pristine-tar to track all git HEAD components, so the .orig tarballs are reproducible
  • d/watch with all MUT components to allow import-orig to include those in debian, upstream and pristine-tar branches cleanly. Without the MUT components, uscan/gbp will only import 'd2' source, missing the componets in 'mod-*/' dirs
    • Additionally, some MUT repos are "pinned" to a specific git-tag. Meaning that uscan will always download a specific tag, unless it's updated manually in d/watch. This is on purpose so MUT updates don't break the .orig tarballs if uscan is run on different dates.

The expected result here is that instead of having (d2 upstream + debian/), we end up with (d2 upstream + debian/ + mod-*/) in the working dir. Doing it in the traditional single-commit on top of upstream won't achieve that (due to MUT).

Note

  • already "mod-golang-geo" HEAD has changed today (12/09), so whatever is imported in this branch will not match origin/pristine-tar. I'll fix this up later, but for now running "gbp-clone" and "gbp-buildpackage" might not work from this branch without fixups.

Testing gbp-import-orig

if you're interested in testing how the import works with the "draft" commit, please follow these steps on debian 'stable' in an emtpy directory.

git clone -b debian-wip-v2 git@salsa.debian.org:go-team/packages/d2.git
cd d2
# reset d/changelog commit
git reset --hard 3082e332feeee1f9ad077434352d7b0aaf8c88e8
# cleanup upstream
git checkout -t origin/upstream/latest
git reset --hard HEAD^
git tag -d upstream/0.7.1+ds1
git switch debian-wip-v2
# import
gbp import-orig --uscan --debian-branch=debian-wip-v2
# build
gbp dch --new-version=0.7.1+ds1-1   # gbp-dch versions incorrectly
gbp buildpackage --git-ignore-new --git-debian-branch=debian-wip-v2
# verify
printf "\n\nBranches and Tag?\n"
git branch -v
git tag
printf "\n3 debs?\n"
ls -1 ../*.deb
Edited by Ahmad Khalifa

Merge request reports

Loading