Hi Ken,
----- Original Message -----
> Dave and/or Nathan,
>
> I've wound back my tree as discussed, and these changes are now on top of the
> latest pcp.io tree ... should be safe to pull from my tree again.
>
Done, and QA remains very contented here - thanks.
>
> Changes committed to git://git.pcp.io/kenj/pcp master
>
> Ken McDonell (11):
> [...]
> debian/control: deleted
This bit is problematic - we must have a debian/control thats part of the
source tarball, as it defines the packaged built by the *official) Debian
build machines. And since we generate the source tarball from git now we
have to have it committed in the tree.
I've reverted that for now - is the problem there having a modified file
in the source tree? (it's OK for control.master to overwrite it locally
for our own builds - annoying to end up with a modified file, but I don't
think there's any other way we can go here...?)
cheers.
--
Nathan
|