>> not experienced after all, but I was reading the FAQ:
>> http://wiki.debian.org/DebianMentorsFaq#What.27s_wrong_with_upstream_shipping_a_debian.2F_directory.3F
>> It states it's undesirable.
>
> It does not. It states it's undesirable for *upstream* to ship
> a debian/ directory in their tarball, which is totally orthogonal to
> what I have been discussing. There's nothing in there about upstream
> or packaging Git repository layout, nor about using branches vs.
> separate repository for packaging.
>
> I really suggest you look at e.g. parcimonie's Git repository [1] to
> get an idea of a way it's often done these days when upstream and
> packager are the same person.
>
> [1] git://gaffer.ptitcanardnoir.org/App-Parcimonie.git
Is it required to have a separate Debian and upstream branch?
Is there documentation about this "upstream = packager" situation?
Looks to me, that most packaging guides are are for "upstream != packager.