Re: [Monotone-debian] Re: [Monotone-devel] branch management

[Richard Levitte]

In message <address@hidden> on Mon, 20 Dec 2010 11:21:07 +0000, Francis Russell 
<address@hidden> said:

francis> Ludovic Brenta wrote:
francis> > Richard or Francis, could
francis> > you please commit a suitable patch as an immediate descendant of
francis> > t:debian-monotone-0.48-3 (fbfd33230edd751a48e33774dbfb4af434eb0910)? 
 It
francis> > is OK to use the branch org.debian.monotone.squeeze for that.
francis> 
francis> I finally got around to starting to look at this, but I'm very confused
francis> by the state of the repo. The 0.99.1 org.debian.monotone head also
francis> appears to be in the squeeze branch.

I think I may be confused as to the purpose of the different branches.

francis> I'm also unsure whether the changes I made to have
francis> monotone-doc recommend instead of depend on monotone were
francis> removed accidentally or deliberately.

That was deliberate:

: ; LANG=C mtn log --from=52675ef7f1b47a94b947e9869ec308d550c43ffc --last=1 
--no-graph
----------------------------------------------------------------------
Revision: 52675ef7f1b47a94b947e9869ec308d550c43ffc
Parent:   6e307643afc3c6e1fbfe2eed71da333786f18015
Author:   Richard Levitte <address@hidden>
Date:     12/05/10 00:10:31
Branch:   org.debian.monotone

Changelog: 

Because of Debian policy (quoted below) and the fact that we make
/usr/shar/doc/monotone-doc a symlink of /usr/share/doc/monotone, we
must make monotone-doc depend on monotone.

>From http://www.debian.org/doc/debian-policy/ch-docs.html#s12.3 :
"/usr/share/doc/package may be a symbolic link to another directory in 
/usr/share/doc only if the two packages both come from the same source and the 
first package Depends on the second."


Changes against parent 6e307643afc3c6e1fbfe2eed71da333786f18015

  patched  control