Re: Understanding Git workflow around DEP-14
On Tue, 12 Mar 2019 12:49:35 +1100,
Ben Finney<bignose@debian.org> wrote:
>Andreas Ronnquist <mailinglists@gusnan.se> writes:
>
>> debian/master is where your packaging work happens in the debian
>> folder, and also where the building of the package happens. (Here you
>> also should have the upstream source merged, to be able to build the
>> package with the standard debuild or dpkg-buildpackage).
>
>So which branch contains *only* the Debian packaging files; that is,
>the files that go into the “Debian package diff” (Debian Policy §3.3)?
>
>Or does DEP-14 mandate mixing the Debian packaging with the upstream
>files?
Nah, it doesn't mandate it, but it does recommend it - see "What to
store in the packaging branches" a bit down the DEP-14 page,
https://dep-team.pages.debian.net/deps/dep14/
>That would make DEP-14 incompatible with the “overlay” workflow, where
>the Debian packaging is tracked in a separate VCS.
>
Sorry, I have only used gbp with the mixed branch workflow - does
anyone else have any hints for gbp with the overlay workflow?
-- Andreas Rönnquist
mailinglists@gusnan.se
andreas@ronnquist.net
Reply to: