Re: upstream source with debian directory

2011-03-01 Thread Harald Jenny
Hi Jérémy On Fri, Feb 25, 2011 at 12:13:31PM +0100, Jérémy Lal wrote: > On 25/02/2011 10:44, Harald Jenny wrote: > > Hi Paul > > > > On Wed, Feb 23, 2011 at 07:48:13AM +0800, Paul Wise wrote: > >> If you weren't using git I would say use dpkg-source v3 which removes > >> any upstream debian/ dir

Re: upstream source with debian directory

2011-02-25 Thread Harald Jenny
Hi Jérémy On Fri, Feb 25, 2011 at 12:13:31PM +0100, Jérémy Lal wrote: > On 25/02/2011 10:44, Harald Jenny wrote: > > Hi Paul > > > > On Wed, Feb 23, 2011 at 07:48:13AM +0800, Paul Wise wrote: > >> If you weren't using git I would say use dpkg-source v3 which removes > >> any upstream debian/ dir

Re: upstream source with debian directory

2011-02-25 Thread Jérémy Lal
On 25/02/2011 10:44, Harald Jenny wrote: > Hi Paul > > On Wed, Feb 23, 2011 at 07:48:13AM +0800, Paul Wise wrote: >> If you weren't using git I would say use dpkg-source v3 which removes >> any upstream debian/ dir during the unpack process. > > Well using v3 format does indeed solve the problem

Re: upstream source with debian directory

2011-02-25 Thread Harald Jenny
Hi On Fri, Feb 25, 2011 at 06:44:49PM +0800, Paul Wise wrote: > On Fri, Feb 25, 2011 at 5:44 PM, Harald Jenny > wrote: > > > You don't have some Howto lying around making going into the detail in here? > > I've never done it myself, searching the web for git pull pristine-tar > found some thing

Re: upstream source with debian directory

2011-02-25 Thread Paul Wise
On Fri, Feb 25, 2011 at 5:44 PM, Harald Jenny wrote: > You don't have some Howto lying around making going into the detail in here? I've never done it myself, searching the web for git pull pristine-tar found some things though. -- bye, pabs http://wiki.debian.org/PaulWise -- To UNSUBSCRIB

Re: upstream source with debian directory

2011-02-25 Thread Harald Jenny
Hi Paul On Wed, Feb 23, 2011 at 07:48:13AM +0800, Paul Wise wrote: > If you weren't using git I would say use dpkg-source v3 which removes > any upstream debian/ dir during the unpack process. Well using v3 format does indeed solve the problem for the user which is not a bad thing either :-). >

Re: upstream source with debian directory

2011-02-22 Thread Paul Wise
If you weren't using git I would say use dpkg-source v3 which removes any upstream debian/ dir during the unpack process. With git I'm not sure but I'd be inclined to just resolve conflicts, continue the merge and maybe send upstream some patches. Now that upstream is also using git you can probab

upstream source with debian directory

2011-02-22 Thread Harald Jenny
Dear list members, I'm currently uploader for openswan were upstream ships it's own version of a debian directory as they provide debs themselves (no chance to change this). As the upstream source did contain non-free docs we had to repackage it anyway so removing the debian directory too was not