Bug#611614: libapache2-mod-shib2: /etc/init.d/shibd removes pidfile before (unsuccesful) attept to stop daemon

[Sam Hartman]

>>>>> "Russ" == Russ Allbery <rra at debian.org> writes:

    Russ> Ferenc Wagner <wferi at niif.hu> writes:
    >> It looks like our squeeze branch misses the merge of
    >> bug/unlink-pidfile.  Nor was upstream/2.3.1+dfsg merged into that
    >> bugfix branch...  As things stand, our master branch has the fix
    >> (e3f9f278) but our debian branch does not, so when I branched
    >> squeeze off it the fix got lost.  I'm a little uncertain how to
    >> untagle this...

    Russ> I think my bright idea of the separate debian branch turns out
    Russ> to be way more confusing than it's worth, so I propose
    Russ> dropping that distinction going forward and merging the debian
    Russ> branch into master, then making Debian-specific changes only
    Russ> in master.  Having separate branches for bug fixes and
    Russ> features that we want to push upstream makes sense, but the
    Russ> distinction between debian and master was never clear and
    Russ> makes it too likely that we'll run into problems like this.

This will save me the trouble of understanding how it worked:-)

Russ is aware of my experiments in doing something similar. I've looked
at git-dpm and topgit.  Topgit seems too immature.  Git-dpm seems like a
potentially valuable tool but it requires a lot of knowledge.
So, there's not really anything I can recommend to replace the
debian/master distinction.