Severity: -1 normal Julian Andres Klode writes ("Bug#1056595: dgit: must not override dpkg include lists"): > dgit overrides the include lists for dpkg, causing packages to include > additional .gitignore and similar files which dpkg-source -b will > exclude.
Yes. This is necessary (1) so that the git trees correspond precisely to the .dscs (which is the invariant of the dgit git view), and (2) to comply with our promise to provide people with the source code. I consider dpkg-source's behaviour, of excluding .gitignore by default, to be wrong: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908747 (You may recall that report, since you commented on it.) > This creates a significant hurdle to the NMU process and downstream > distribution maintainers who have to figure out how to reduce the > delta again, because in both cases, unrelated changes should not > be present in the diff between the two uploads. I'm afraid I don't understand your scenario precisely. I'm sympathetic to the goal of removing hurdles for NMUers and downstream maintainers. > Like I had to spend about 20 minutes or so today trying to figure out > how to actually get that sorted out for a native package (I was trying > -i all the time when I should have passed -I), in turn I discovered > some other process issues but that's beside the point :D Were you trying to use dgit to make an NMU? If so what git branch did you start with? What options did you give to dgit? Or, are you the maintainer? In which case, I'd like to know more about what went wrong. Did some NMUer using dgit make an upload that is causing you trouble? As background: I generally recommend that someone doing an NMU which they intend to upload with dgit, also obtain their baseline package with dgit. Eg, see https://manpages.debian.org/bookworm/dgit/dgit-nmu-simple.7.en.html I recommend that users should *not* use the semi-official Debian git sources because they're not suitable for non-Debian-experts: https://diziet.dreamwidth.org/9556.html Of course if - like you do - you know what you're doing, then you can start from (eg) a salsa branch. But then I'm afraid that this problem with .gitignore may be just another one of the strange Debian things that you have to know. Even so, I'm open to ideas of ways to make this wrinkle less annoying. Ian. -- Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own. Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk, that is a private address which bypasses my fierce spamfilter.