On Thu, Nov 23, 2023 at 05:57:42PM +0000, Ian Jackson wrote:
> 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.)
I see, I consider dpkg's behavior to be the correct one, and if you
want to override it, do it in debian/source/options, not by passing
arguments to dpkg.
>
> > 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?
No, I have no intention to ever use dgit. I believe its design is
directly opposed to what I consider the right workflow.
In my case it was not actually an NMU but I was building a prepared
merge downstream in Ubuntu which removed files that were present
in the Debian upload, but it's the same issue NMUers in Debian
face.
If I start with the .dsc, have no intention of ever touching dgit,
I need to manually figure out why files go missing vs the previous
upload and how to make them not disappear.
Like for both NMUs, and downstream work, what we care about is not
"oh rebuild is cleaning out some garbage in the tarball" (normally
we are happy about that), but about maintaining the smallest possible
change to the base version.
--
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer i speak de, en
