Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-05 Thread Jonas Smedegaard

On Sat, Feb 05, 2011 at 04:31:54AM +, Miguel Colon wrote:

Joel, it seems that you have to live with manually popping the patches
from the stack, until the integration matures.


Kind of late but what I do is add among other things:

[git-buildpackage]
export-dir = ~/git-repo/multimedia/output

to the ~/gbf.conf file. This would just make a temporary copy of the
source in that directory / compile it (with pbuilder in my case) /
remove the temporary source if there was no error (with error the
source is left there so you could analyze it if needed) and stores the
resulting package files there.

It leaves the original source untouched so he can run git-buildpackage
as many times as he wants in a row which was his original goal. This
method does not require adding the local-options file and is useful if
you want to avoid adding that file to multiple git trees.


Yes, this is another style of dealing with the marriage of dpkg-source 
and git-buildpackage: let git-buildpackage hide its existense by 
exporting to a non-VCS dir before handing over to dpkg-source.


I prefer prefer a closer marriage.  Also because that helps discover 
packaging flaws regarding not claning up properly in the clean target.




If for some reason he want to trash the original source (like using
dpkg-buildpackage) he could add an alias to ~/gitconfig
[alias]
 undo = !git reset --hard  git clean -xdf

and do git undo but this command should be used with care to say the 
least.


I find it dangerous to throw brutal suggestions like that without 
further elaborating what it does.



 - Jonas

--
 * Jonas Smedegaard - idealist  Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private


signature.asc
Description: Digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-04 Thread Jonas Smedegaard

On Fri, Feb 04, 2011 at 06:37:25AM +0100, Reinhard Tartler wrote:

On Fri, Feb 04, 2011 at 01:21:57 (CET), Joel Roth wrote:

The ecasound package currently requires a manual 'pop -a' after a 
git-buildpackage before another git-buildpackage is possible.


Successive builds are possible by adding dh_quilt_unpatch to the 
override_dh_auto_clean rule. But that still leaves the package 
sources with the patch applied.


Is there a place to put dh_quilt_unpatch at the *end* of the build 
process?


btw, the debian policy manual is unclear (to me) about whether the 
'clean' target cares about the quilt patch queue status.


FYI (and because not everyone was around at that time yet), this is 
pretty much why I was against adpoting v3 source package for 
pkg-multimedia. The git integration still seems less than ideal to me.


Yes, you _were_ against it earlier on. What is more relevant here, and 
surprises me, is that you _still_ find it less than ideal.


Joel, it seems that you have to live with manually popping the patches 
from the stack, until the integration matures.


Since the time of some hesitating and others pushing for source v3, we 
have found - I believe - a sane way for source v3 and git-buildpackage 
to work reliably together:


  * Add this to debian/source/format:

3.0 (quilt)

  * Add this to .gitignore:

/.pc

  * Add this to debian/source/local-options:

unapply-patches
abort-on-upstream-changes


If anyone find this less than ideal then please elaborate on why.


 - Jonas

--
 * Jonas Smedegaard - idealist  Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private


signature.asc
Description: Digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-04 Thread Joel Roth
On Fri, Feb 04, 2011 at 01:34:35PM +0100, Jonas Smedegaard wrote:
 On Fri, Feb 04, 2011 at 06:37:25AM +0100, Reinhard Tartler wrote:
 On Fri, Feb 04, 2011 at 01:21:57 (CET), Joel Roth wrote:
 
 The ecasound package currently requires a manual 'pop -a' after
 a git-buildpackage before another git-buildpackage is possible.
 
 Successive builds are possible by adding dh_quilt_unpatch to the
 override_dh_auto_clean rule. But that still leaves the package
 sources with the patch applied.
 
 Is there a place to put dh_quilt_unpatch at the *end* of the
 build process?
 
 btw, the debian policy manual is unclear (to me) about whether
 the 'clean' target cares about the quilt patch queue status.
 
 FYI (and because not everyone was around at that time yet), this
 is pretty much why I was against adpoting v3 source package for
 pkg-multimedia. The git integration still seems less than ideal to
 me.
 
 Yes, you _were_ against it earlier on. What is more relevant here,
 and surprises me, is that you _still_ find it less than ideal.
 
 Joel, it seems that you have to live with manually popping the
 patches from the stack, until the integration matures.
 
 Since the time of some hesitating and others pushing for source v3,
 we have found - I believe - a sane way for source v3 and
 git-buildpackage to work reliably together:
 
   * Add this to debian/source/format:
 
   3.0 (quilt)
 
   * Add this to .gitignore:
 
   /.pc
 
   * Add this to debian/source/local-options:
 
   unapply-patches
   abort-on-upstream-changes

Can this be added to the docs?  
 
 If anyone find this less than ideal then please elaborate on why.
 
 
  - Jonas
 
 -- 
  * Jonas Smedegaard - idealist  Internet-arkitekt
  * Tlf.: +45 40843136  Website: http://dr.jones.dk/
 
  [x] quote me freely  [ ] ask before reusing  [ ] keep private



 ___
 pkg-multimedia-maintainers mailing list
 pkg-multimedia-maintainers@lists.alioth.debian.org
 http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


-- 
Joel Roth

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-04 Thread Jonas Smedegaard

On Fri, Feb 04, 2011 at 07:33:24AM -1000, Joel Roth wrote:

On Fri, Feb 04, 2011 at 01:34:35PM +0100, Jonas Smedegaard wrote:
Since the time of some hesitating and others pushing for source v3, 
we have found - I believe - a sane way for source v3 and 
git-buildpackage to work reliably together:


  * Add this to debian/source/format:

3.0 (quilt)

  * Add this to .gitignore:

/.pc

  * Add this to debian/source/local-options:

unapply-patches
abort-on-upstream-changes


Can this be added to the docs?


It is a wiki: You are most welcome!


 - Jonas

--
 * Jonas Smedegaard - idealist  Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private


signature.asc
Description: Digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-04 Thread Jaromír Mikeš
2011/2/4 Jonas Smedegaard d...@jones.dk:

 Since the time of some hesitating and others pushing for source v3, we
 have found - I believe - a sane way for source v3 and git-buildpackage to
 work reliably together:

  * Add this to debian/source/format:

        3.0 (quilt)

  * Add this to .gitignore:

        /.pc

  * Add this to debian/source/local-options:

        unapply-patches
        abort-on-upstream-changes

 Can this be added to the docs?

 It is a wiki: You are most welcome!

Wiki updated
http://wiki.debian.org/DebianMultimedia/DevelopPackaging

regards

mira

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-03 Thread Reinhard Tartler
On Fri, Feb 04, 2011 at 01:21:57 (CET), Joel Roth wrote:

 The ecasound package currently requires a manual 'pop -a' after
 a git-buildpackage before another git-buildpackage is
 possible.

 Successive builds are possible by adding dh_quilt_unpatch to the
 override_dh_auto_clean rule. But that still leaves
 the package sources with the patch applied.

 Is there a place to put dh_quilt_unpatch at the *end*
 of the build process?

 btw, the debian policy manual is unclear (to me) about whether the
 'clean' target cares about the quilt patch queue status.

FYI (and because not everyone was around at that time yet), this is
pretty much why I was against adpoting v3 source package for
pkg-multimedia. The git integration still seems less than ideal to me.

Joel, it seems that you have to live with manually popping the patches
from the stack, until the integration matures.

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-03 Thread Joel Roth
On Fri, Feb 04, 2011 at 06:37:25AM +0100, Reinhard Tartler wrote:
 On Fri, Feb 04, 2011 at 01:21:57 (CET), Joel Roth wrote:
 
  The ecasound package currently requires a manual 'pop -a' after
  a git-buildpackage before another git-buildpackage is
  possible.
 
  Successive builds are possible by adding dh_quilt_unpatch to the
  override_dh_auto_clean rule. But that still leaves
  the package sources with the patch applied.
 
  Is there a place to put dh_quilt_unpatch at the *end*
  of the build process?
 
  btw, the debian policy manual is unclear (to me) about whether the
  'clean' target cares about the quilt patch queue status.
 
 FYI (and because not everyone was around at that time yet), this is
 pretty much why I was against adpoting v3 source package for
 pkg-multimedia. The git integration still seems less than ideal to me.
 
 Joel, it seems that you have to live with manually popping the patches
 from the stack, until the integration matures.
 
Thanks for clarifying this. Of course I can easily add a
wrapper to handle it; mainly concerned about general
practice. From your reply I understand that completed
build with patches applied is current behavior.

If this is the only problem for quilt 3.0, it doesn't seem
like much, at least to my newbie sensibilities.

   
Regards,

Joel

 -- 
 Gruesse/greetings,
 Reinhard Tartler, KeyID 945348A4
 
 ___
 pkg-multimedia-maintainers mailing list
 pkg-multimedia-maintainers@lists.alioth.debian.org
 http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers

-- 
Joel Roth

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-03 Thread Bilal akhtar
pThere is a way to automate that. Add unapply-patches to 
debian/source/local-options ./p
pBilal Akhtar /p


___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers


Re: Ecasound - getting quilt to pop -a after git-buildpackage

2011-02-03 Thread Reinhard Tartler
On Fri, Feb 04, 2011 at 07:23:51 (CET), Joel Roth wrote:

 On Fri, Feb 04, 2011 at 06:37:25AM +0100, Reinhard Tartler wrote:
 On Fri, Feb 04, 2011 at 01:21:57 (CET), Joel Roth wrote:
 
  The ecasound package currently requires a manual 'pop -a' after
  a git-buildpackage before another git-buildpackage is
  possible.
 
  Successive builds are possible by adding dh_quilt_unpatch to the
  override_dh_auto_clean rule. But that still leaves
  the package sources with the patch applied.
 
  Is there a place to put dh_quilt_unpatch at the *end*
  of the build process?
 
  btw, the debian policy manual is unclear (to me) about whether the
  'clean' target cares about the quilt patch queue status.
 
 FYI (and because not everyone was around at that time yet), this is
 pretty much why I was against adpoting v3 source package for
 pkg-multimedia. The git integration still seems less than ideal to me.
 
 Joel, it seems that you have to live with manually popping the patches
 from the stack, until the integration matures.
  
 Thanks for clarifying this. Of course I can easily add a
 wrapper to handle it; mainly concerned about general
 practice. From your reply I understand that completed
 build with patches applied is current behavior.

 If this is the only problem for quilt 3.0, it doesn't seem
 like much, at least to my newbie sensibilities.

On the 2nd read, my previous followup might be misleading; I really like
the new features of Source Format 3.0 (quilt), and I really welcome its
adoption both in debian as a whole and inside pkg-multimedia. My
concerns apply to:

 - understandability to less experienced team members
 - integration in existing evironments (e.g., stable)

It seems that at least by now, both concerns aren't that important and
the benefits clearly overweight the concerns.

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers