Thanks -- although now I get another error when attempting the build: jas@frallan:~/dpkg/slat$ sbuild --no-clean dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building slat using existing ./slat_1.0.0.orig.tar.xz dpkg-source: error: cannot represent change to docs/demo-poster.jpg: binary file contents changed dpkg-source: error: add docs/demo-poster.jpg in debian/source/include- binaries if you want to store the modified binary in the debian tarball ...
And indeed if I run 'uscan -ddd -v' it will download a *.orig.tar.xz that doesn't contain these *.jpg's due to the .gitattributes file. Since git contains the file, there is an error. Some ideas: 1) Avoid .gitattributes. 2) Modify debian/watch to not respect .gitattributes 3) Modify git content to match what is downloaded via debian/watch. Given that .gitattributes looks fairly good, maybe the solution here is to revert back to NOT track upstream git but to track the upstream GitHub-generated git-archive tarballs, and import that tarball into Salsa git. The website/ stuff ignored by .gitattributes is not used in the Debian packaging. /Simon sön 2026-10-11 klockan 09:30 +0530 skrev Bobby Anthene: > Hi Simon, > > You were right that the Salsa history was wrong. I had imported the > upstream release archive rather than the complete upstream Git > history. > The archive honors .gitattributes export-ignore entries, so it > omitted > the website and other development files from the Git tree. > > I have corrected the repository on Salsa: > > https://salsa.debian.org/go-team/packages/slat > > The full upstream v1.0.0 history is now on the upstream branch and > tagged > upstream/1.0.0. It is merged into debian/sid at commit 900ad05. > > I verified that: > > git diff --name-only upstream..debian/sid > > contains only files under debian/. No application source code was > changed. > > The debian/sid branch, upstream branch, and upstream/1.0.0 tag have > all > been pushed to Salsa. > > Thanks for catching this. > > Best regards, > Bobby Anthene > > On Sun, Oct 11, 2026 at 2:51 AM Simon Josefsson <[email protected]> > wrote: > > > > Hi! Something seems weird with the Salsa git content, it shouldn't > > differ this large to v1.0.0 should it? Perhaps you could import > > v1.0.0 > > into a branch 'upstream' and then merge that into the 'debian/sid' > > branch. The diff between upstream tag and debian/sid should only > > be > > files in debian/ in the normal case. > > > > /Simon > > > > jas@frallan:~/dpkg/slat$ git log -1 v1.0.0 |head -3 > > commit 88e211da24a640865fd2853304a1f5290cb8c863 > > Author: Bobby Anthene <[email protected]> > > Date: Thu Oct 8 16:17:09 2026 +0530 > > jas@frallan:~/dpkg/slat$ git log -1 debian/sid |head -3 > > commit 8bcae4cc985545740c85f0976bcce19f1191164d > > Author: noturbob <[email protected]> > > Date: Thu Oct 8 16:40:35 2026 +0530 > > jas@frallan:~/dpkg/slat$ git diff v1.0.0..debian/sid |grep ^diff|wc > > -l > > 66 > > jas@frallan:~/dpkg/slat$ > >
signature.asc
Description: This is a digitally signed message part
