Re: backport questions

2016-07-25 Thread Etienne Dysli-Metref
On 23/07/16 01:07, Ferenc Wágner wrote:
>> - Can I push the backport branches to the repositories in [1]?
> 
> Yes, please do so.  Please discuss the necessary changes on our mailing
> list beforehand, I'd like to keep the delta small.
> 
>> - What should the changelog entry look like? "Backport to "?
> 
> Start with what dch --bpo proposes, then add new bullets for your
> backporting changes (if needed).
> 
>> - Are older "backport" changelog entries kept or removed when a new
>> version is backported?
> 
> I think it means that you can keep them (interleaved by the unstable
> entries), or you can merge them into a single entry at the tip.  The
> former is probably easier to generate, while the latter is easier to
> grasp.

Thank you for the explanations Feri! :)

  Etienne



signature.asc
Description: OpenPGP digital signature


Re: backport questions

2016-07-22 Thread Ferenc Wágner
Etienne Dysli-Metref  writes:

> I would like to backport Shibboleth packages [1] to jessie and wheezy.
>
> - What branch name should I use?
> Documentation for git-buildpackage [2] says "debian/" so that
> would yield "debian/jessie-backports-sloppy", but I've seen
> "backports/" earlier so I'm unsure.

I recommend debian/jessie-backports.

> - Can I push the backport branches to the repositories in [1]?

Yes, please do so.  Please discuss the necessary changes on our mailing
list beforehand, I'd like to keep the delta small.

> - What should the changelog entry look like? "Backport to "?

Start with what dch --bpo proposes, then add new bullets for your
backporting changes (if needed).

> - Are older "backport" changelog entries kept or removed when a new
> version is backported?
> The Backports contribution doc [3] says:
>
>> Backports of an updated version of a package that was backported 
>> before may have a changelog that merges entries of backports of 
>> previous versions, but this is not required.
>
> but I can't make sense out of this...

I think it means that you can keep them (interleaved by the unstable
entries), or you can merge them into a single entry at the tip.  The
former is probably easier to generate, while the latter is easier to
grasp.
-- 
Feri



Re: backport questions

2016-07-22 Thread Etienne Dysli-Metref
On 22/07/16 14:15, Alexander Wirt wrote:
>> And the distribution field should be the backport target
>> (jessie-backports-sloppy), right?
> Depends on your backport. The one that matches to your backport. And
> jessie-backports-sloppy is in every case wrong at this point in time. 

Ah right, yes! that should be jessie-backports or wheezy-backports-sloppy.

  Etienne



signature.asc
Description: OpenPGP digital signature


Re: backport questions

2016-07-22 Thread Alexander Wirt
On Fri, 22 Jul 2016, Etienne Dysli-Metref wrote:

> Thank you Alex :)
> 
> On 22/07/16 13:16, Alexander Wirt wrote:
> >> - Can I push the backport branches to the repositories in [1]?
> > The backports team doesn't care about the git, you will have to ask the 
> > other
> > maintainers. 
> 
> Ok
> 
> >> - What should the changelog entry look like? "Backport to "?
> > That + all backports specific changes to the package.
> And the distribution field should be the backport target
> (jessie-backports-sloppy), right?
Depends on your backport. The one that matches to your backport. And
jessie-backports-sloppy is in every case wrong at this point in time. 

Alex


signature.asc
Description: PGP signature


Re: backport questions

2016-07-22 Thread Etienne Dysli-Metref
Thank you Alex :)

On 22/07/16 13:16, Alexander Wirt wrote:
>> - Can I push the backport branches to the repositories in [1]?
> The backports team doesn't care about the git, you will have to ask the other
> maintainers. 

Ok

>> - What should the changelog entry look like? "Backport to "?
> That + all backports specific changes to the package.
And the distribution field should be the backport target
(jessie-backports-sloppy), right?

Cheers,
  Etienne



signature.asc
Description: OpenPGP digital signature


Re: backport questions

2016-07-22 Thread Alexander Wirt
On Fri, 22 Jul 2016, Etienne Dysli-Metref wrote:

> Hello mentors,
> 
> I would like to backport Shibboleth packages [1] to jessie and wheezy.
> 
> - What branch name should I use?
> Documentation for git-buildpackage [2] says "debian/" so that
> would yield "debian/jessie-backports-sloppy", but I've seen
> "backports/" earlier so I'm unsure.
> 
> - Can I push the backport branches to the repositories in [1]?
The backports team doesn't care about the git, you will have to ask the other
maintainers. 
> 
> - What should the changelog entry look like? "Backport to "?
That + all backports specific changes to the package.

> - Are older "backport" changelog entries kept or removed when a new
> version is backported?
> The Backports contribution doc [3] says:
> 
> > Backports of an updated version of a package that was backported 
> > before may have a changelog that merges entries of backports of 
> > previous versions, but this is not required.
> 
> but I can't make sense out of this...
You can, but you don't have to include the changelog entrys in the changes
file. We (ftpmasters)  don't enforce this (anymore). 

Alex - ftpmaster



signature.asc
Description: PGP signature