Re: add pristine-tar

2010-05-27 Thread Dmitrijs Ledkovs
>> sorry, but this is simply wrong. Both the format name (3.0 (quilt)) and >> the development history show that Raphael tries really really hard to >> simulate the exact behavior of quilt, even if quilt is not installed in >> the build environment. > > Trying "really really hard" is to me a sign of

Re: add pristine-tar

2010-05-27 Thread Jonas Smedegaard
On Thu, May 27, 2010 at 06:46:32PM +0200, Reinhard Tartler wrote: On Do, Mai 27, 2010 at 17:50:50 (CEST), Jonas Smedegaard wrote: On Thu, May 27, 2010 at 10:35:02AM -0400, Felipe Sateler wrote: On Thu, May 27, 2010 at 10:34, Felipe Sateler wrote: On Thu, May 27, 2010 at 03:54, Jonas Smedegaar

Re: add pristine-tar

2010-05-27 Thread Reinhard Tartler
On Do, Mai 27, 2010 at 17:50:50 (CEST), Jonas Smedegaard wrote: > On Thu, May 27, 2010 at 10:35:02AM -0400, Felipe Sateler wrote: >>On Thu, May 27, 2010 at 10:34, Felipe Sateler wrote: >>> On Thu, May 27, 2010 at 03:54, Jonas Smedegaard wrote: On Thu, May 27, 2010 at 09:09:15AM +0200, Reinh

Re: add pristine-tar

2010-05-27 Thread Jonas Smedegaard
On Thu, May 27, 2010 at 10:35:02AM -0400, Felipe Sateler wrote: On Thu, May 27, 2010 at 10:34, Felipe Sateler wrote: On Thu, May 27, 2010 at 03:54, Jonas Smedegaard wrote: On Thu, May 27, 2010 at 09:09:15AM +0200, Reinhard Tartler wrote: Yeah - tests should be composed so that _failure_ tr

Re: add pristine-tar

2010-05-27 Thread Felipe Sateler
On Thu, May 27, 2010 at 10:34, Felipe Sateler wrote: > On Thu, May 27, 2010 at 03:54, Jonas Smedegaard wrote: >> On Thu, May 27, 2010 at 09:09:15AM +0200, Reinhard Tartler wrote: >>> Yeah - tests should be composed so that _failure_ triggers alternative action:        test ! -

Re: add pristine-tar

2010-05-27 Thread Felipe Sateler
On Thu, May 27, 2010 at 03:54, Jonas Smedegaard wrote: > On Thu, May 27, 2010 at 09:09:15AM +0200, Reinhard Tartler wrote: >> >>> Yeah - tests should be composed so that _failure_ triggers alternative >>> action: >>> >>>        test ! -d .git || dh_quilt_unpatch >> >> oh right, thanks for pointing

Re: add pristine-tar

2010-05-27 Thread Jonas Smedegaard
On Thu, May 27, 2010 at 09:09:15AM +0200, Reinhard Tartler wrote: Yeah - tests should be composed so that _failure_ triggers alternative action: test ! -d .git || dh_quilt_unpatch oh right, thanks for pointing this out. Is this a basis for consensus? Shall we agree on this variant f

Re: add pristine-tar

2010-05-27 Thread Reinhard Tartler
> Yeah - tests should be composed so that _failure_ triggers alternative > action: > > test ! -d .git || dh_quilt_unpatch oh right, thanks for pointing this out. Is this a basis for consensus? Shall we agree on this variant for the clean rule? -- Gruesse/greetings, Reinhard Tartler, Ke

Re: add pristine-tar

2010-05-26 Thread Jaromír Mikeš
> Od: Felipe Sateler > Jaromir, if you are migrating to 3.0 (quilt) you need to drop the > --with quilt part of dh invocation, I think. I tried with and without " --with quilt" invocation both seems to works fine for me source/format set to 3.0 and rules file without any extra unpatching scrip

Re: add pristine-tar

2010-05-26 Thread Jonas Smedegaard
On Wed, May 26, 2010 at 05:24:09PM -0400, Felipe Sateler wrote: On Wed, May 26, 2010 at 17:12, Reinhard Tartler wrote: On Mi, Mai 26, 2010 at 22:05:58 (CEST), Dmitrijs Ledkovs wrote: ifneq (,$(wildcard .git/*))        dh_quilt_unpatch endif Not bad, but how about in a single line? , |

Re: add pristine-tar

2010-05-26 Thread Dmitrijs Ledkovs
On 26 May 2010 22:24, Felipe Sateler wrote: > On Wed, May 26, 2010 at 17:12, Reinhard Tartler wrote: >> On Mi, Mai 26, 2010 at 22:05:58 (CEST), Dmitrijs Ledkovs wrote: >> >>> ifneq (,$(wildcard .git/*)) >>>        dh_quilt_unpatch >>> endif >> >> Not bad, but how about in a single line? >> >> ,--

Re: add pristine-tar

2010-05-26 Thread Felipe Sateler
On Wed, May 26, 2010 at 17:12, Reinhard Tartler wrote: > On Mi, Mai 26, 2010 at 22:05:58 (CEST), Dmitrijs Ledkovs wrote: > >> ifneq (,$(wildcard .git/*)) >>        dh_quilt_unpatch >> endif > > Not bad, but how about in a single line? > > , > |       test -d .git && dh_quilt_unpatch > ` T

Re: add pristine-tar

2010-05-26 Thread Reinhard Tartler
On Mi, Mai 26, 2010 at 22:05:58 (CEST), Dmitrijs Ledkovs wrote: > ifneq (,$(wildcard .git/*)) >dh_quilt_unpatch > endif Not bad, but how about in a single line? , | test -d .git && dh_quilt_unpatch ` -- Gruesse/greetings, Reinhard Tartler, KeyID 945348A4

Re: add pristine-tar

2010-05-26 Thread Dmitrijs Ledkovs
On 26 May 2010 20:53, Reinhard Tartler wrote: > On Mi, Mai 26, 2010 at 20:02:45 (CEST), Jaromír Mikeš wrote: > >> I am trying use your script above, but getting this error: >> >> $ git-buildpackage -S --git-ignore-new >> dh --with quilt clean >>    dh_testdir >>    debian/rules override_dh_auto_cl

Re: add pristine-tar

2010-05-26 Thread Reinhard Tartler
On Mi, Mai 26, 2010 at 20:02:45 (CEST), Jaromír Mikeš wrote: > I am trying use your script above, but getting this error: > > $ git-buildpackage -S --git-ignore-new > dh --with quilt clean >dh_testdir >debian/rules override_dh_auto_clean > make[1]: Entering directory `/home/mira/zita-conv

Re: add pristine-tar

2010-05-26 Thread Jonas Smedegaard
On Wed, May 26, 2010 at 08:02:45PM +0200, Jaromír Mikeš wrote: FS > More. The unpatch should be done only if within a git repository. FS > Something like: FS > override_dh_auto_clean: FS > if [ -d .git ] ; then \ FS > quilt pop -a \ FS > fi FS > dh_auto_clean I am trying use your scr

Re: add pristine-tar

2010-05-26 Thread Jaromír Mikeš
> Od: Felipe Sateler RT> > The last consensus was that yes, under the condition that the clean RT> > target of debian rules restores the working copy to a state that is RT> > ready for git diff/commit operations. Most commongly this means to RT> > unpatch in the clean target. RT> > The intend be

Re: add pristine-tar

2010-05-26 Thread Felipe Sateler
On Wed, May 26, 2010 at 05:22, Dmitrijs Ledkovs wrote: > On 26 May 2010 02:24, Felipe Sateler wrote: >> On Tue, May 25, 2010 at 18:02, Jaromír Mikeš wrote: Od: Felipe Sateler >>> >>> RT> > The last consensus was that yes, under the condition that the clean >>> RT> > target of debian rules

Re: add pristine-tar

2010-05-26 Thread Dmitrijs Ledkovs
On 26 May 2010 02:24, Felipe Sateler wrote: > On Tue, May 25, 2010 at 18:02, Jaromír Mikeš wrote: >>> Od: Felipe Sateler >> >> RT> > The last consensus was that yes, under the condition that the clean >> RT> > target of debian rules restores the working copy to a state that is >> RT> > ready for

Re: add pristine-tar

2010-05-25 Thread Felipe Sateler
On Tue, May 25, 2010 at 18:02, Jaromír Mikeš wrote: >> Od: Felipe Sateler > > RT> > The last consensus was that yes, under the condition that the clean > RT> > target of debian rules restores the working copy to a state that is > RT> > ready for git diff/commit operations. Most commongly this mea

Re: add pristine-tar

2010-05-25 Thread Jaromír Mikeš
> Od: Felipe Sateler RT> > The last consensus was that yes, under the condition that the clean RT> > target of debian rules restores the working copy to a state that is RT> > ready for git diff/commit operations. Most commongly this means to RT> > unpatch in the clean target. RT> > The intend be

Re: add pristine-tar

2010-05-25 Thread Felipe Sateler
On Tue, May 25, 2010 at 07:19, Reinhard Tartler wrote: > On Di, Mai 25, 2010 at 12:42:02 (CEST), Jaromír Mikeš wrote: > >> >> switching to source/format 3.0 solved my problem. >> Now my orig.tar.bz2 is included in .dsc , .changes files and is generated by >> pbuilder >> >> Is using source/format

Re: add pristine-tar

2010-05-25 Thread Reinhard Tartler
On Di, Mai 25, 2010 at 12:42:02 (CEST), Jaromír Mikeš wrote: > > switching to source/format 3.0 solved my problem. > Now my orig.tar.bz2 is included in .dsc , .changes files and is generated by > pbuilder > > Is using source/format 3.0 fine for team packaging policy? we (I) should finally update

Re: add pristine-tar

2010-05-25 Thread Jaromír Mikeš
>>Od: Jonas Smedegaard > >>Use git-buildpackage --git-compression=bzip >> >>Or better: add a hint about compression type to debian/gbp.conf. >>See the source of e.g. morituri for an example. > >debian/gpg.conf make the trick nicely > >git-buildpackage -S now generate orig.tar.bz2 >But when I b

Re: add pristine-tar

2010-05-24 Thread Jonas Smedegaard
Hi Jaromír (and others), On Mon, May 24, 2010 at 03:33:58AM +0200, Jaromír Mikeš wrote: Od: Jonas Smedegaard Use git-buildpackage --git-compression=bzip Or better: add a hint about compression type to debian/gbp.conf. See the source of e.g. morituri for an example. debian/gpg.conf make

Re: add pristine-tar

2010-05-23 Thread Jaromír Mikeš
Od: Jonas Smedegaard Use git-buildpackage --git-compression=bzip Or better: add a hint about compression type to debian/gbp.conf. See the source of e.g. morituri for an example. debian/gpg.conf make the trick nicely git-buildpackage -S now generate orig.tar.bz2 But when I building packag

Re: add pristine-tar

2010-05-23 Thread Jaromír Mikeš
Od: Jonas Smedegaard >> Od: Jaromír Mikeš > >> few repositories I co-maintain missing pristine-tar. >> How to add pristine-tar to such existing repo? > >I tried: >$ pristine-tar commit ../zita-convolver_2.0.0.orig.tar.bz2 >and get: >$ pristine-tar: committed zita-convolver_2.0.0.orig.tar.bz2.

Re: add pristine-tar

2010-05-23 Thread Jonas Smedegaard
On Sun, May 23, 2010 at 09:32:31AM +0200, Jaromír Mikeš wrote: Od: Jaromír Mikeš few repositories I co-maintain missing pristine-tar. How to add pristine-tar to such existing repo? I tried: $ pristine-tar commit ../zita-convolver_2.0.0.orig.tar.bz2 and get: $ pristine-tar: committed zita-co

Re: add pristine-tar

2010-05-23 Thread Jaromír Mikeš
> Od: Jaromír Mikeš > few repositories I co-maintain missing pristine-tar. > How to add pristine-tar to such existing repo? I tried: $ pristine-tar commit ../zita-convolver_2.0.0.orig.tar.bz2 and get: $ pristine-tar: committed zita-convolver_2.0.0.orig.tar.bz2.delta to branch pristine-tar Than