Bug#513952: topgit: proposed CDBS snippet
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Thu, Apr 30, 2009 at 08:36:38PM -0400, Frédéric Brière wrote: >On Fri, May 01, 2009 at 01:59:35AM +0200, Jonas Smedegaard wrote: >> It should? Are you asking or telling? It sounds like you know >> something - please elaborate. > >Not at all -- I'm actually somewhat confused right now. :) > >tg2quilt.mk contains a unpatch: __tg-temp-export dependency, to update >the patch series before unpatching. However, patchsys-quilt.mk only >hooks reverse-config, and not unpatch, unto clean. This means that >__tg-temp-export will never get called. > >(Also, from what I understand, unpatch will end up depending on >__tg-temp-export and reverse-patches, but in no particular order. That >doesn't seem right.) Ok, I understand now. Yes, I think you are right. - Jonas - -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkn6XREACgkQn7DbMsAkQLhj3wCfR6R8NXpREU6o8LWaG4yliebY pdYAoKib7+l9lsoq3+wtPhu2rBxZTOmZ =htCN -END PGP SIGNATURE- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
On Fri, May 01, 2009 at 01:59:35AM +0200, Jonas Smedegaard wrote: > It should? Are you asking or telling? It sounds like you know > something - please elaborate. Not at all -- I'm actually somewhat confused right now. :) tg2quilt.mk contains a unpatch: __tg-temp-export dependency, to update the patch series before unpatching. However, patchsys-quilt.mk only hooks reverse-config, and not unpatch, unto clean. This means that __tg-temp-export will never get called. (Also, from what I understand, unpatch will end up depending on __tg-temp-export and reverse-patches, but in no particular order. That doesn't seem right.) -- Debian is the Jedi operating system: "Always two there are, a master and an apprentice". -- Simon Richter on debian-devel -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Thu, Apr 30, 2009 at 07:19:55PM -0400, Frédéric Brière wrote: >On Sat, Feb 28, 2009 at 02:27:32PM +0100, Jonas Smedegaard wrote: >> Something like this: git.debian.org/git/collab-maint/cdbs-skel ? > >Shouldn't reverse-patches depend on __tg-temp-export? It should? Are you asking or telling? It sounds like you know something - please elaborate. Kind regards, - Jonas - -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkn6O2cACgkQn7DbMsAkQLhcwQCglR6ZkpSNWYn1QvlZMmkdmP0n OVEAoJoc/Ep5K1gRN3uC7V/tmEQCUgk3 =A8Ou -END PGP SIGNATURE- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
On Sat, Feb 28, 2009 at 02:27:32PM +0100, Jonas Smedegaard wrote: > Something like this: git.debian.org/git/collab-maint/cdbs-skel ? Shouldn't reverse-patches depend on __tg-temp-export? -- * joeyh installs debian using only his big toe, for a change of pace -- in #debian-boot -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
On Mon, Mar 16, 2009 at 01:45:26PM +0100, martin f krafft wrote: > I just wanted to let you know that I have no capacities to follow > this discussion right now. Neither do we, apparently. :) Alright, I'll be bold and clone this bug, as my "provide sane default values" proposal, which I've argued for earlier on, is somewhat unrelated to CDBS. -- <|ryan|> I don't use deb u poor man netgod: heh apt-get install task-p0rn -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
Hey folks, I just wanted to let you know that I have no capacities to follow this discussion right now. Uwe and I decided not to include the snippet in 0.7 because we felt that there was a need for further discussion, which I see is now happening. If you guys reach consensus, please don't hesitate to let us know, and then I/we will take a look. Obviously, a tested patch would be preferred still. :) -- .''`. martin f. krafft Related projects: : :' : proud Debian developer http://debiansystem.info `. `'` http://people.debian.org/~madduckhttp://vcs-pkg.org `- Debian - when you have better things to do than fixing systems never underestimate the power of human stupidity. digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/)
Bug#513952: topgit: proposed CDBS snippet
Excerpts from Stefano Zacchiroli's message of man mar 16 11:33:04 +0100 2009: > On Sun, Mar 15, 2009 at 02:23:31AM +0100, Jonas Smedegaard wrote: > > It sounds like you didn't actually look at my proposed snippet, > > containing the following comment: > > > > # This very makefile snippet ideally is provided by the topgit > > # package - see bug#513952. > > # Also, Debian Policy 4.14 implicitly recommends build-depending on > > # packages containing build documentation referenced from > > # Debian.source. > > I looked at the snippet, but overlooked the comment (and I was not > aware of the policy recommendation). > > Given that it is so, let it be. Even if it still sounds me a bit dumb > to have people fiddle with, or just be aware of, topgit _just_ to > fulfill a documentation requirement automatically. It is not a big > deal either. I felt it a bit dumb too - until I thought about it a bit more: Debian has a noble rule of not relying on network access. Imagine sitting offline and wanting to read that packaging documentation, just to realize that it contains only pointers to inaccessible files. As a packager you are still left with the choice of providing more self-contained pakcages by *not* referring to package-external documentation but write something up yourself. Kind regards, - Jonas -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: PGP signature
Bug#513952: topgit: proposed CDBS snippet
On Sun, Mar 15, 2009 at 02:23:31AM +0100, Jonas Smedegaard wrote:
> It sounds like you didn't actually look at my proposed snippet,
> containing the following comment:
>
> # This very makefile snippet ideally is provided by the topgit package
> # - see bug#513952.
> # Also, Debian Policy 4.14 implicitly recommends build-depending on
> # packages containing build documentation referenced from Debian.source.
I looked at the snippet, but overlooked the comment (and I was not
aware of the policy recommendation).
Given that it is so, let it be. Even if it still sounds me a bit dumb
to have people fiddle with, or just be aware of, topgit _just_ to
fulfill a documentation requirement automatically. It is not a big
deal either.
Cheers.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...| ..: | Je dis tu à tous ceux que j'aime
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
Excerpts from Stefano Zacchiroli's message of søn mar 15 02:05:32 +0100 2009: > On Sun, Mar 15, 2009 at 01:07:15AM +0100, Jonas Smedegaard wrote: > > In addition to including tg2quilt.mk, CDBS provides other > > functionality - specifically it provides hints about > > build-dependencies (including chain-loading to also resolve quilt > > build-dependencies, which is *not* just the quilt package itself). > > Is this relevant here? Build dependencies on topgit are not needed. > Also, topgit in Debian is also meant to be friendly to who knows > nothing about it and just rely on quilt. So it would make even more > sense to *not* include something topgit-specific in debian/rules and > rather stay put with something quilt-specific. I believe it is relevant, yes. It sounds like you didn't actually look at my proposed snippet, containing the following comment: # This very makefile snippet ideally is provided by the topgit package # - see bug#513952. # Also, Debian Policy 4.14 implicitly recommends build-depending on # packages containing build documentation referenced from Debian.source. - Jonas -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: PGP signature
Bug#513952: topgit: proposed CDBS snippet
On Sun, Mar 15, 2009 at 01:07:15AM +0100, Jonas Smedegaard wrote:
> In addition to including tg2quilt.mk, CDBS provides other
> functionality - specifically it provides hints about
> build-dependencies (including chain-loading to also resolve quilt
> build-dependencies, which is *not* just the quilt package itself).
Is this relevant here? Build dependencies on topgit are not
needed. Also, topgit in Debian is also meant to be friendly to who
knows nothing about it and just rely on quilt. So it would make even
more sense to *not* include something topgit-specific in debian/rules
and rather stay put with something quilt-specific.
Just my 0.02€.
Cheers.
--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..| . |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...| ..: | Je dis tu à tous ceux que j'aime
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
[resent without nice french(?) chars in header unhandled by sup-mail] Excerpts from Frédéric Brière's message of lør mar 14 21:54:17 +0100 2009: > On Fri, Feb 27, 2009 at 06:05:53PM +0100, martin f krafft wrote: > > also sprach Jonas Smedegaard [2009.02.27.1743 +0100]: > > > Please consider shipping the attached CDBS snippet with topgit: > > > > > > 1) install it as /usr/share/cdbs/1/topgit.mk > > I kinda feel this is the wrong approach. Not that a CDBS-topgit > (properly placed under /rules) would be a bad idea, but it seems to me > like slapping a patch over the lack of default values in tg2quilt.mk. [details on QUILT_PATCH_DIR and QUILT_STAMPFN snipped] I agree that ideally this whould be fixed in quilt: bug#517664. Even if/when fixed in quilt, it still makes sense for TopGit to provide a CDBS snippet, however: In addition to including tg2quilt.mk, CDBS provides other functionality - specifically it provides hints about build-dependencies (including chain-loading to also resolve quilt build-dependencies, which is *not* just the quilt package itself). Yes, the proposed CDBS snippet contains workarounds, because at the moment such workarounds are needed. When the underlying bug is fixed, it might make sense to drop the workaround and instead depend versioned on properly working releases of quilt. Since this bugreport is about being nice to CDBS users, I insist that providing the proposed CDBS snippet is the way to go - despite the concrete issue spawning this bugreport really belongs to quilt. Kind regards, - Jonas -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private signature.asc Description: PGP signature
Bug#513952: topgit: proposed CDBS snippet
On Fri, Feb 27, 2009 at 06:05:53PM +0100, martin f krafft wrote: > also sprach Jonas Smedegaard [2009.02.27.1743 +0100]: > > Please consider shipping the attached CDBS snippet with topgit: > > > > 1) install it as /usr/share/cdbs/1/topgit.mk I kinda feel this is the wrong approach. Not that a CDBS-topgit (properly placed under /rules) would be a bad idea, but it seems to me like slapping a patch over the lack of default values in tg2quilt.mk. For $(QUILT_PATCH_DIR) at least, why shouldn't tg2quilt.mk assume debian/patches by default? This is certainly the de facto location for quilt patches, made semi-official with the 3.0 (quilt) source format. As for $(QUILT_STAMPFN), things are less clear-cut. I initially thought of suggesting debian/stamp-patched, shared by both quilt.make and CDBS. But after looking at several packages using quilt[*], I noticed that most packages using neither quilt.make nor CDBS do not rely on stampfiles, and merely call quilt every time. So, on second thought, I would suggest having $(QUILT_STAMPFN) default to "patch". That way, one could easily drop tg2quilt.mk into pretty much any debian/rules out there, add a dependency to the patch rule if there wasn't any, and that's it. If you use a stampfile, you define $(QUILT_STAMPFN); if you don't, you don't. (In that case, the original issue of this bug report would remain, but I feel this is something that would be best addressed by either tg2quilt.mk or patchsys-quilt.mk (#517664), instead of creating another Makefile in-between. But that's just me.) > I am a little uninclined to address this in TopGit. Why doesn't > patchsys-quilt emulate the "API" properly? Isn't API is a strong term? I doubt those variables were meant to be used that way in the first place. Anyway, the reason for the discrepancy is that all CDBS variables invariably fall under the $(DEB_*) namespace. (Though it certainly doesn't explain the naming of $(DEB_PATCHDIRS), which is meant to hold only one value.) [*] There are currently 1954 packages in main which build-depend on quilt. Out of curiosity, I downloaded the first 131 until I ran out of space. (Ahem.) My findings were: * All but one store their patches under debian/patches * 78 use quilt.make * 30 use patchsys-quilt.mk * 17 just call quilt without any stampfile * 2 create stamp-patch * 2 create patch-stamp * 1 relies on a pkg-kde-tools makefile which I didn't look at * 1 uses dpatch despite the build-dependency -- Joy: Hey, I'm an asshole. Assholes emit odious gas. That's what we do. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
Hi Jonas, On Sun, Mar 01, 2009 at 04:06:26PM +0100, Jonas Smedegaard wrote: > ...or tell me if you find it ok that I do minor polishing like that > myself - now that I notice that it is in collab-maint where I have > already write access :-D I wonder if you merged your work into debian/build on purpose instead of debian/master. Maybe you did it for building a private package and didn't intend to push it? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions| http://www.pengutronix.de/ | -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Sat, Feb 28, 2009 at 02:27:32PM +0100, Jonas Smedegaard wrote: >[sent again, to bugreport this time] > >On Fri, Feb 27, 2009 at 06:05:53PM +0100, martin f krafft wrote: >>also sprach Jonas Smedegaard [2009.02.27.1743 +0100]: >>> Please consider shipping the attached CDBS snippet with topgit: >>> >>> 1) install it as /usr/share/cdbs/1/topgit.mk >> >>Thanks for the bug report! >> >>I'll cut you a deal: I'll do this if you write me a brief >>README.quilt for inclusion, which explains how to use topgit and >>cdbs, ideally with an example and in a way that allows people to >>figure out what happens when and why. I would find this very useful. > >Something like this: git.debian.org/git/collab-maint/cdbs-skel ? I am quite interested in your opinion on above referenced README.source - - as I am currently preparing applying that file (or variations of it) to about 80 different source package officially packaged for Debian. >>> 2) have the binary "topgit" package suggest cdbs >> >>I will have to think about that. TopGit is not about Debian >>packaging, but cdbs is. I am not sure I like this relation, but >>I will think about it. > >...which is the reason I propose to _suggest_ (not recommend): >Something that makes more use of your package, without being relevant >for most users. Alternatively, you could avoid shipping that makefile snippet designed specifically for packaging, if you really want your package to not be tied to packaging. Or at least ship it only as an example file (which no package should rely on, forcing all packages to then embed a copy of your snippet). Or you could provide a separate binary package, like pkg-topgit, containing the current makefile snippet and the README.source useful for any package, and my proposed CDBS-specific makefile snippet. You could then have that binary package (and not the main topgit binary package) recommend make and quilt, and suggest cdbs. >>> ...you should probably have the package suggest quilt as well, but >>> that really is a separate issue - and I am too eager to play some >>> more with TopGit to file a separate bugreport about it :-P >> >>Consider that done with commit 6d8cb97. >> >>http://git.debian.org/?p=collab-maint/topgit.git;a=commitdiff;h=6d8cb9730c6ec32fd56d8b0eb254ac0f835ec475 You should probably suggest make as well :-) ...or tell me if you find it ok that I do minor polishing like that myself - now that I notice that it is in collab-maint where I have already write access :-D (then time will tell if we have same understanding of the term "minor") - Jonas - -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkmqpHIACgkQn7DbMsAkQLgw+wCeNrywCeql+RSKm4IuSqv95RvV basAn2USXnl3/Ir9XLCGD+YymYvYvbBe =dwoV -END PGP SIGNATURE- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
also sprach Jonas Smedegaard [2009.02.28.1427 +0100]: > >I'll cut you a deal: I'll do this if you write me a brief > >README.quilt for inclusion, which explains how to use topgit and > >cdbs, ideally with an example and in a way that allows people to > >figure out what happens when and why. I would find this very useful. > > Something like this: git.debian.org/git/collab-maint/cdbs-skel ? I don't really understand how that is relevant. The README.source has way too much information that I don't need. A TopGit CDBS snippet IMnsHO needs to have a short README.source which explains exactly what needs to be done, assuming that the person knows CDBS and TopGit/Git (and if not, there are seperate docs for that). To round it off, an example with sufficient comments would be good. > ...so I guess you should forward that very relevant question to quilt > maintainers. Perhaps they had someone external to them hand them a > script - just as I do for you now. Done. You and this bug report have been CC'ed. > It might be that the location of patches can be redefined, but > redefining topgit patch location independently from quilt patch > location makes no sense - and might break thing. Right, so all the more important that all involved parties agree on one place where the patch location is specified. > >Instead, I think this might best be addressed with a comment before > >the PATCHES_DIR variable, which explains what it's for and when it > >can be changed and what the user has to consider. Agreed? > > Uh, why not simply use a single variable name across snippets? Exactly. Something like this? http://git.debian.org/?p=collab-maint/topgit.git;a=commitdiff;h=32158f526a4add8e1461a17414dee675a80d3f8e -- .''`. martin f. krafft Related projects: : :' : proud Debian developer http://debiansystem.info `. `'` http://people.debian.org/~madduckhttp://vcs-pkg.org `- Debian - when you have better things to do than fixing systems digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/)
Bug#513952: topgit: proposed CDBS snippet
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [sent again, to bugreport this time] On Fri, Feb 27, 2009 at 06:05:53PM +0100, martin f krafft wrote: >also sprach Jonas Smedegaard [2009.02.27.1743 +0100]: >> Please consider shipping the attached CDBS snippet with topgit: >> >> 1) install it as /usr/share/cdbs/1/topgit.mk > >Thanks for the bug report! > >I'll cut you a deal: I'll do this if you write me a brief >README.quilt for inclusion, which explains how to use topgit and >cdbs, ideally with an example and in a way that allows people to >figure out what happens when and why. I would find this very useful. Something like this: git.debian.org/git/collab-maint/cdbs-skel ? >> 2) have the binary "topgit" package suggest cdbs > >I will have to think about that. TopGit is not about Debian >packaging, but cdbs is. I am not sure I like this relation, but >I will think about it. ...which is the reason I propose to _suggest_ (not recommend): Something that makes more use of your package, without being relevant for most users. (written from the top of my head - actual official defined purpose of "suggests" is most probably slightly differently worded) >> Including my proposed snippet does not exactly solve this bug, but it >> turns it into a less severe one: >> >> CDBS use majuscles (capital letters) for variables allowed to be changed >> and minuscles for "internal" variables (i.e. possibly shared across >> snippets but not for the packages to redefine). >> >> The current need for the topgit.mk snippet to declare PATCHES_DIR is >> confusing as it might wrongly be seen as an invitation for overriding. > >Hm. Stefano analysed the situation by saying: > > However, CDBS users do not reqly on quilt.make, but rather on > /usr/share/cdbs/1/rules/patchsys-quilt.mk , which neither include > quilt.make nor provide the same "API" by the means of > QUILT_PATCH_DIR. > >I am a little uninclined to address this in TopGit. Why doesn't >patchsys-quilt emulate the "API" properly? patchsys-quilt.mk is provided by quilt - just as I propose adding topgit.mk to topgit :-) ...so I guess you should forward that very relevant question to quilt maintainers. Perhaps they had someone external to them hand them a script - just as I do for you now. >Also, cdbs uses majuscles for editable stuff, and miniscules for >internal stuff? That's *exactly* the opposite from how I learnt to >code (though not necessarily how I code these days), which is to use >capitals for constants and lowercase for everything else. The point >is that adopting cdbs style on this might just cause a conflict >elsewhere. Ahem, problem is my bad use of terms here. All capitalized variables are, I believe, meant to be static. But they can be (re)defined by the package maintainer. It might be that the location of patches can be redefined, but redefining topgit patch location independently from quilt patch location makes no sense - and might break thing. Does that make sense, or should I come up with an concrete example? >Instead, I think this might best be addressed with a comment before >the PATCHES_DIR variable, which explains what it's for and when it >can be changed and what the user has to consider. Agreed? Uh, why not simply use a single variable name across snippets? >> ...you should probably have the package suggest quilt as well, but >> that really is a separate issue - and I am too eager to play some >> more with TopGit to file a separate bugreport about it :-P > >Consider that done with commit 6d8cb97. > >http://git.debian.org/?p=collab-maint/topgit.git;a=commitdiff;h=6d8cb9730c6ec32fd56d8b0eb254ac0f835ec475 Good. - Jonas - -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkmpO8QACgkQn7DbMsAkQLhRxgCeJvwd2E1uFY8NOQKil5h/ls+B BiMAn3j/2Io4CyXxfuJLS1xoMdtdu81I =05Pa -END PGP SIGNATURE- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#513952: topgit: proposed CDBS snippet
also sprach Jonas Smedegaard [2009.02.27.1743 +0100]: > Please consider shipping the attached CDBS snippet with topgit: > > 1) install it as /usr/share/cdbs/1/topgit.mk Thanks for the bug report! I'll cut you a deal: I'll do this if you write me a brief README.quilt for inclusion, which explains how to use topgit and cdbs, ideally with an example and in a way that allows people to figure out what happens when and why. I would find this very useful. > 2) have the binary "topgit" package suggest cdbs I will have to think about that. TopGit is not about Debian packaging, but cdbs is. I am not sure I like this relation, but I will think about it. > Including my proposed snippet does not exactly solve this bug, but it > turns it into a less severe one: > > CDBS use majuscles (capital letters) for variables allowed to be changed > and minuscles for "internal" variables (i.e. possibly shared across > snippets but not for the packages to redefine). > > The current need for the topgit.mk snippet to declare PATCHES_DIR is > confusing as it might wrongly be seen as an invitation for overriding. Hm. Stefano analysed the situation by saying: However, CDBS users do not reqly on quilt.make, but rather on /usr/share/cdbs/1/rules/patchsys-quilt.mk , which neither include quilt.make nor provide the same "API" by the means of QUILT_PATCH_DIR. I am a little uninclined to address this in TopGit. Why doesn't patchsys-quilt emulate the "API" properly? Also, cdbs uses majuscles for editable stuff, and miniscules for internal stuff? That's *exactly* the opposite from how I learnt to code (though not necessarily how I code these days), which is to use capitals for constants and lowercase for everything else. The point is that adopting cdbs style on this might just cause a conflict elsewhere. Instead, I think this might best be addressed with a comment before the PATCHES_DIR variable, which explains what it's for and when it can be changed and what the user has to consider. Agreed? > ...you should probably have the package suggest quilt as well, but > that really is a separate issue - and I am too eager to play some > more with TopGit to file a separate bugreport about it :-P Consider that done with commit 6d8cb97. http://git.debian.org/?p=collab-maint/topgit.git;a=commitdiff;h=6d8cb9730c6ec32fd56d8b0eb254ac0f835ec475 -- .''`. martin f. krafft Related projects: : :' : proud Debian developer http://debiansystem.info `. `'` http://people.debian.org/~madduckhttp://vcs-pkg.org `- Debian - when you have better things to do than fixing systems digital_signature_gpg.asc Description: Digital signature (see http://martin-krafft.net/gpg/)
Bug#513952: topgit: proposed CDBS snippet
Package: topgit Version: 0.5-1 Followup-For: Bug #513952 Hi Martin, I finally got around to dive into TopGit with CDBS. And was hurt by this bug. Attached is the cdbs snippet that I wrote for my own use. I prefer declaring that I use TopGit. This has the benefit over Stefanos approach of including patchsys-quilt.mk that if you ever restructure to not need quilt, then we (in principle) need no changes to each package. Please consider shipping the attached CDBS snippet with topgit: 1) install it as /usr/share/cdbs/1/topgit.mk 2) have the binary "topgit" package suggest cdbs Including my proposed snippet does not exactly solve this bug, but it turns it into a less severe one: CDBS use majuscles (capital letters) for variables allowed to be changed and minuscles for "internal" variables (i.e. possibly shared across snippets but not for the packages to redefine). The current need for the topgit.mk snippet to declare PATCHES_DIR is confusing as it might wrongly be seen as an invitation for overriding. ...you should probably have the package suggest quilt as well, but that really is a separate issue - and I am too eager to play some more with TopGit to file a separate bugreport about it :-P Kind regards, - Jonas -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.28-1-amd64 (SMP w/2 CPU cores) Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages topgit depends on: ii git-core 1:1.6.1.3-1 fast, scalable, distributed revisi topgit recommends no packages. topgit suggests no packages. -- no debconf information # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2009 Jonas Smedegaard # Description: let Handle patches using TopGit and quilt # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2, or (at # your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. _cdbs_scripts_path ?= /usr/lib/cdbs _cdbs_rules_path ?= /usr/share/cdbs/1/rules _cdbs_class_path ?= /usr/share/cdbs/1/class ifndef _cdbs_rules_topgit _cdbs_rules_topgit = 1 include $(_cdbs_rules_path)/patchsys-quilt.mk$(_cdbs_makefile_suffix) # Currently TopGit is not used in any policy-specified build targets #CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), topgit # These are hardcoded!! # TODO: convince patchsys-quilt.mk and tg2quilt.mk to use our variables PATCHES_DIR := $(DEB_PATCHDIRS) QUILT_STAMPFN := debian/stamp-patched include /usr/share/topgit/tg2quilt.mk endif
