Re: maint-guide updates (take 2)
On Mon, 20 Sep 2010, Osamu Aoki wrote:
> <p>When you want to manage Debian packaging activities under a VCS, you
> typically create one branch (e.g. <tt>upstream</tt>) tracking the
> upstream source and another branch (e.g. <tt>main</tt>) tracking the
> Debian package. For the <tt>main</tt> branch, you usually want to have
Why not use "master" or "debian", I don't know any VCS using "main" as
common branch name.
> unpatched upstream source with <file>debian/*</file> files for the
> Debian packaging for the ease of merging new upstream releases.
> <p>After building a package, the source is normally left patched. You
> need to unpatch it manually by running "<tt>quilt pop -a</tt>" before
> committing to the <tt>main</tt> branch. You can automate this unpatch
> by adding the optional <file>debian/source/local-options</file> file
> containing "<tt>--unapply-patches</tt>". This file is not included in
Note: remove the "--" in debian/source/local-options, it's only "unapply-patches".
> the generated source package and changes the local build behavior only
> (see <manref name="dpkg-source" section="1">).
Raphaël Hertzog ◈ Debian Developer ◈ [Flattr=20693]
Follow my Debian News ▶ http://RaphaelHertzog.com (English)
▶ http://RaphaelHertzog.fr (Français)