[Pkg-haproxy-maintainers] Wheezy backport and 1.5 in experimental

Apollon Oikonomopoulos apoikos at gmail.com
Tue May 14 21:42:00 UTC 2013

On 23:09 Tue 14 May     , Vincent Bernat wrote:
>  ❦ 14 mai 2013 07:45 CEST, Apollon Oikonomopoulos <apoikos at gmail.com> :
> > To that end, we will need three branches, say:
> >
> >  • master (unstable)
> >  • wheezy
> >  • experimental
> >
> > We could use the same upstream branch for both 1.4 and 1.5, what do you 
> > think? I've already started doing some work on 1.5 using the same 
> > upstream branch, would you like me to push?
> I don't quite understand how we could share the same upstream branch. It
> will get messy once we have 1.5-dev18 then 1.4.24 then 1.5-dev19. It
> will work but it will be quite strange. I don't know if there is a best
> practice here.

Well, technically it should work since we never touch the upstream 
source and don't generate any collisions. But I agree with you, a 
separate branch will be cleaner (upstream even uses a separate 

> I would prefer to use a separate upstream branch. Maybe
> it's possible to teach git-buildpackage which upstream branch to use
> when using some debian branch (experimental -> upstream-1.5).

We could use a per-branch debian/gbp.conf, it will make our lives 

> Also, for the version number, be sure to use something like "1.5~dev18"
> so that we don't run into any problem when 1.5 is out.

Yes, I'm already aware of that. I'll move upstream sources to a 
different branch and push everything when I find some time.


More information about the Pkg-haproxy-maintainers mailing list