On Tue, Jul 16, 2019 at 05:58:49PM +0900, Masahiro Yamada wrote: > I want debian/ to be kept as a drop-in directory > for packagers, without replacing the upstream debian/rules. > > If a check-in source file is modified in anyway, > scripts/setlocalversion would set -dirty flag, > which I want to avoid. In practice, that's not going to be a problem for most distributions. The traditional way Debian-derived systems have done builds is completely outside of git. So there will be a linux_5.2.orig.tar.gz and a linux_5.2-1.debian.tar.xz. dpkg_source -x will first unpackage the orig.tar.gz, and then the debian.tar.xz, and if the second overwrites the first, it's no big deal. More modern Debian package maintainer workflows may be using git, but in that case, all of the "Debianizations" are reflected in a separate branch. So it's not going to set the -dirty flag. There will be potential merge conflicts between Enrico's proposed "upstream default debian/rules" file and the Debian/Ubuntu debian/rules file on their distro branch. However, I don't think that's a big issue, for two reasons. First, once it's checked in, I expect changes to the default debian/rules file will be relatively rare. Secondly, it's easy enough to use gitattributes and defining a custom merge driver so that a distribution can configure things so that they always use the version of debian/rules from their branch, so the merge conflict resolution can be set up to always do the right thing. There are certainly other upstreams which ship their own debian/ directories. E2fsprogs is one such example, but in that case I'm cheating because I'm both the Debian package maintainer as well as the upstream maintainer. :-) However, it's never been an issue for Ubuntu when they choose to ship their own customized debian/rules file. > debian/rules is a hook for packagers to do their jobs in downstream. > "We kindly committed a generic one for you" sounds weird to me. It is weird, and it's not common for upstream packages (which are not native Debian packages) to ship their own debian directory. But it certainly does happen, and it won't cause any problems in actual practice. Regards, - Ted
