Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
Hi, On Thu, Mar 11, 2010 at 08:58:38AM +1100, Craig Small wrote: On Wed, Mar 10, 2010 at 09:04:08PM +0900, Osamu Aoki wrote: If you have good 3.0 (quilt) example with patches to replace dpatch section, I think we can make 3.0 (quilt) more popular. I've been using it in my packages, partly because its a good thing (its so much better than dpatch- though its interaction with git is annoying) and partly so the documentation and dh-make could be updated. Is this so??? I was expecting it to be quite simple by reading manpages of git-buildpackage and gitpkg programs For git-buildpackage: --git-upstream-branch --git-debian-branch also --git-pristine-tar (I do not see dpkg 3.0 format mentined in manpage) For gitpkg: gitpkg branch origbranch (It seems gitpkg.dpkg-source can pass ...) Osamu -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
Hi, On Wed, Mar 10, 2010 at 09:36:29AM +1100, Craig Small wrote: On Tue, Mar 09, 2010 at 10:19:38PM +0900, Osamu Aoki wrote: I think it is better to have 3.0 (native) as default. Then it works almost as if old one. It skips .git etc for tar ball so these are improvements. 3.0 (native) is for native packages only, from dpkg-source(1): Format: 3.0 (native) This format is an extension of the native package format as defined in the 1.0 format and Format: 1.0 A source package in this format consists either of a .orig.tar.gz asso- ciated to a .diff.gz or a single .tar.gz (in that case the package is said to be native). Hmmm. I see. If you insist 3.0 (quilt) here, Build-Depends: debhelper (= 7) should include quilt. (per http://wiki.debian.org/Projects/DebSrc3.0 ) Where does it say that, from that webpage: Does a 3.0 (quilt) source package need to build-depend on quilt? If you drop the quilt usage in debian/rules (patch/unpatch logic), then no. I thougt I heard so too sometime ago. (I must have seen some outdated howto somewhere.) Oh, it seems debhelper (= 7) is not good default. Lintian recommend debhelper (= 7.0.50) which is new enough to support dh syntax well. I've updated this to 7.0.50, yes as we're using just dh we need to increase the depends version. Also using quilt seem to need some funky make file modification ... I Using quilt without the 3.0 (quilt) source format you have to. Using quilt within a 3.0 (quilt) source format you do not need this anymore. I see where my confusion came from... But Raphael Hertzog states in http://wiki.debian.org/Projects/DebSrc3.0 So I do not know what dh-make should do. Not put any of the quilt-specific stuff in. It probably means I need to remove the quilt flags. The thing is, I'm not sure what you do if you want to use dpatch. I want to remove dpatch section and put some good example to show how patch series can be added via 3.0 (quilt). Once we sort these up, main story of maint-guide should be made to use 3.0 (native). Then dpatch section should be replaced with example to use 3.0 (quilt) format. The maint guide should use 3.0 (native) as it's a Debian speicific native package. The examples should use quilt format. I see your point. I did use 3.0 (native) for this upload. (Quite honestly, I only used native format.) Osamu -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
Raphael, thanks... On Wed, Mar 10, 2010 at 07:13:06AM +0100, Raphael Hertzog wrote: ... maint-guide should cover mostly 3.0 (quilt) (and 3.0 (native) for native packages of Debian) you must realize that 3.0 (quilt) can be used also when you don't have patches... This last one was my big misunderstanding. If you have good 3.0 (quilt) example with patches to replace dpatch section, I think we can make 3.0 (quilt) more popular. The following needs updates. http://www.debian.org/doc/manuals/maint-guide/ch-build.en.html#s-dpatch http://www.debian.org/doc/manuals/maint-guide/ap-pkg-eg.en.html#s-pkg-dpatch I do not think we need to advocate dpatch anymore. Osamu PS: Now discussion is more about maint-guide. dh-make seems to be fixed for debhelper version issue. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
On Wed, 10 Mar 2010, Osamu Aoki wrote: If you have good 3.0 (quilt) example with patches to replace dpatch section, I think we can make 3.0 (quilt) more popular. Define good. I mean the quilt handling is now done by dpkg-source so the source package doesn't contain any quilt logic (so it can't be good or bad). Some 3.0 (quilt) packages with patches: quilt, ftplib, libxml-mini-perl The following needs updates. http://www.debian.org/doc/manuals/maint-guide/ch-build.en.html#s-dpatch http://www.debian.org/doc/manuals/maint-guide/ap-pkg-eg.en.html#s-pkg-dpatch Many things need an update indeed. Also -i -I are not needed anymore with 3.0 source packages, they are implicit by default. If package version is not at -0 or -1 Debian revision, you must provide dpkg-buildpackage command with the -sa option That's also outdated, -sa is needed if the last changelog entry is not the first one for the given upstream version. I do not think we need to advocate dpatch anymore. Agreed. PS: Now discussion is more about maint-guide. dh-make seems to be fixed for debhelper version issue. Reassign the bug? Cheers, -- Raphaël Hertzog Like what I do? Sponsor me: http://ouaza.com/wp/2010/01/05/5-years-of-freexian/ My Debian goals: http://ouaza.com/wp/2010/01/09/debian-related-goals-for-2010/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
reassign 573160 maint-guide retitle 573160 update document in line with new dpkg 3.0 (quilt) thanks On Wed, Mar 10, 2010 at 01:39:56PM +0100, Raphael Hertzog wrote: On Wed, 10 Mar 2010, Osamu Aoki wrote: If you have good 3.0 (quilt) example with patches to replace dpatch section, I think we can make 3.0 (quilt) more popular. Define good. I mean the quilt handling is now done by dpkg-source so the source package doesn't contain any quilt logic (so it can't be good or bad). I meant that good as good example to use 3.0 (quilt) format with multiple patches. Some 3.0 (quilt) packages with patches: quilt, ftplib, libxml-mini-perl I will study them The following needs updates. http://www.debian.org/doc/manuals/maint-guide/ch-build.en.html#s-dpatch http://www.debian.org/doc/manuals/maint-guide/ap-pkg-eg.en.html#s-pkg-dpatch Many things need an update indeed. Also -i -I are not needed anymore with 3.0 source packages, they are implicit by default. Oh, I was thiking of them too. But new handling in debian directory in original tar ball may needs to be documented too. If package version is not at -0 or -1 Debian revision, you must provide dpkg-buildpackage command with the -sa option That's also outdated, -sa is needed if the last changelog entry is not the first one for the given upstream version. I see. I do not think we need to advocate dpatch anymore. Agreed. PS: Now discussion is more about maint-guide. dh-make seems to be fixed for debhelper version issue. Reassign the bug? I did since Craig has updated debhelper version put by his package. So no point keeping here. I CCed him so he will not close this bug accidentally. Osamu -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
On Wed, Mar 10, 2010 at 09:04:08PM +0900, Osamu Aoki wrote: If you have good 3.0 (quilt) example with patches to replace dpatch section, I think we can make 3.0 (quilt) more popular. I've been using it in my packages, partly because its a good thing (its so much better than dpatch- though its interaction with git is annoying) and partly so the documentation and dh-make could be updated. I do not think we need to advocate dpatch anymore. I agree! - Craig -- Craig Small GnuPG:1C1B D893 1418 2AF4 45EE 95CB C76C E5AC 12CA DFA5 http://www.enc.com.au/ csmall at : enc.com.au http://www.debian.org/ Debian GNU/Linux, software should be Free -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
Package: dh-make Version: 0.52 Severity: wishlist (FYI: maint-guide uploaded with many changes by you. Thanks.) It seems dh-make makes dpkg 3.0 quilt as default. This is a bit of jump from the previous behavior. I think it is better to have 3.0 (native) as default. Then it works almost as if old one. It skips .git etc for tar ball so these are improvements. If you insist 3.0 (quilt) here, Build-Depends: debhelper (= 7) should include quilt. (per http://wiki.debian.org/Projects/DebSrc3.0 ) debhelper (7.0.50) unstable; urgency=low * This release is designed to be easily backportable to stable, to support the new style of rules file that I expect many packages will use. * dh: debian/rules override targets can change what is run for a specific debhelper command in a sequence. (Thanks Modestas Vainius for the improved makefile parser.) * dh: Redid all the examples to use override targets, since these eliminate all annoying boilerplate and are much easier to understand than the old method. ... Oh, it seems debhelper (= 7) is not good default. Lintian recommend debhelper (= 7.0.50) which is new enough to support dh syntax well. Since you use dh, we need to do so. Also using quilt seem to need some funky make file modification ... I have not done this but this page seems credible. http://wiki.debian.org/HolgerLevsen adding patches with quilt to a package 1. add quilt to build-depends 2. create debian/patches/ and put the patches there 3. cd debian/patches ; ls series 4. add QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 to the configure target in debian/rules 5. add QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 to the clean target in debian/rules 6. enjoy :) But Raphael Hertzog states in http://wiki.debian.org/Projects/DebSrc3.0 You should remove everything related to quilt in debian/rules (patch/unpatch logic, cleanup of quilt stamp file and its .pc directory). Note that if you keep those rules, you must unpack the source package with a recent version of dpkg (= 1.15.5.4) to ensure that dpkg-source creates the .pc files that quilt itself expects. Be aware that some buildds (running an old sbuild) do unpack the source package outside of the build chroot (on a lenny system running an old version of dpkg 1.14.28), so keeping those rules will make the package fail to build on those buildds. So I do not know what dh-make should do. Aside from which one should be default, they should be selectable feature. I suggest following option to make these selectable. -3 n | -3 native -3 q | -3 quilt ... with this we can accept git etc. Also interactive screen, this choice should be asked with ample guiding dialogue too. Anyway, When I was making upload of maint-guide, I realized all these. Once we sort these up, main story of maint-guide should be made to use 3.0 (native). Then dpatch section should be replaced with example to use 3.0 (quilt) format. Any thought? -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-3-amd64 (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages dh-make depends on: ii debhelper 7.4.15 helper programs for debian/rules ii dpkg-dev 1.15.5.6 Debian package development tools ii make 3.81-7 An utility for Directing compilati ii perl 5.10.1-11 Larry Wall's Practical Extraction dh-make recommends no packages. Versions of packages dh-make suggests: ii build-essential 11.4 Informational list of build-essent -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
On Tue, Mar 09, 2010 at 10:19:38PM +0900, Osamu Aoki wrote: I think it is better to have 3.0 (native) as default. Then it works almost as if old one. It skips .git etc for tar ball so these are improvements. 3.0 (native) is for native packages only, from dpkg-source(1): Format: 3.0 (native) This format is an extension of the native package format as defined in the 1.0 format and Format: 1.0 A source package in this format consists either of a .orig.tar.gz asso- ciated to a .diff.gz or a single .tar.gz (in that case the package is said to be native). If you insist 3.0 (quilt) here, Build-Depends: debhelper (= 7) should include quilt. (per http://wiki.debian.org/Projects/DebSrc3.0 ) Where does it say that, from that webpage: Does a 3.0 (quilt) source package need to build-depend on quilt? If you drop the quilt usage in debian/rules (patch/unpatch logic), then no. Oh, it seems debhelper (= 7) is not good default. Lintian recommend debhelper (= 7.0.50) which is new enough to support dh syntax well. I've updated this to 7.0.50, yes as we're using just dh we need to increase the depends version. Also using quilt seem to need some funky make file modification ... I Using quilt without the 3.0 (quilt) source format you have to. Using quilt within a 3.0 (quilt) source format you do not need this anymore. But Raphael Hertzog states in http://wiki.debian.org/Projects/DebSrc3.0 So I do not know what dh-make should do. Not put any of the quilt-specific stuff in. It probably means I need to remove the quilt flags. The thing is, I'm not sure what you do if you want to use dpatch. Once we sort these up, main story of maint-guide should be made to use 3.0 (native). Then dpatch section should be replaced with example to use 3.0 (quilt) format. The maint guide should use 3.0 (native) as it's a Debian speicific native package. The examples should use quilt format. -- Craig Small GnuPG:1C1B D893 1418 2AF4 45EE 95CB C76C E5AC 12CA DFA5 http://www.enc.com.au/ csmall at : enc.com.au http://www.debian.org/ Debian GNU/Linux, software should be Free -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#573160: dh-make: Default should be 3.0 (native) (not 3.0 (quilt)) ... or make it selectable
On Tue, 09 Mar 2010, Osamu Aoki wrote: I think it is better to have 3.0 (native) as default. Then it works almost as if old one. It skips .git etc for tar ball so these are improvements. dh-make does the right thing: - 3.0 (native) if you don't have an upsteam tarball - 3.0 (quilt) if you have an upstream tarball If you insist 3.0 (quilt) here, Build-Depends: debhelper (= 7) should include quilt. (per http://wiki.debian.org/Projects/DebSrc3.0 ) No, it's not needed. Also using quilt seem to need some funky make file modification ... I have not done this but this page seems credible. http://wiki.debian.org/HolgerLevsen Nope, modifying debian/rules was needed before support for it was built in dpkg-source. That page is not up-to-date wrt new formats. Aside from which one should be default, they should be selectable feature. I suggest following option to make these selectable. -3 n | -3 native -3 q | -3 quilt ... with this we can accept git etc. Really no, dh-make should pick the right format between native and quilt based on what it knows and it should not need to know of all other existing formats that are not in official use in Debian. The user can always edit debian/source/format manually afterwards if he really need that. But given the target audience of dh-make, it's best to not confuse people with more options... Once we sort these up, main story of maint-guide should be made to use 3.0 (native). Then dpatch section should be replaced with example to use 3.0 (quilt) format. maint-guide should cover mostly 3.0 (quilt) (and 3.0 (native) for native packages of Debian) you must realize that 3.0 (quilt) can be used also when you don't have patches... Cheers, -- Raphaël Hertzog Like what I do? Sponsor me: http://ouaza.com/wp/2010/01/05/5-years-of-freexian/ My Debian goals: http://ouaza.com/wp/2010/01/09/debian-related-goals-for-2010/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
