Bug#522426: [Python-apps-team] Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?
2009/4/27 Vincent Danjean vdanj...@debian.org: There is an issue in the build-tool chain. In fact, the current package (1.2-1) FTBFS (fails to build from source) with the tools in sid. I suspect this is a change in cdbs that trigger this problem. Two solutions can be done for this bug: - find a small patch so that the current package can build with sid tools - redone the packaging based on dh7 directly (and drop the cdbs dependency) I'm planning to do the second one but I'm missing free time to do it for now. I also will accept any patch that can lead to a package that can be built with current sid tools. Regards, Vincent Heya. After playing around in pbuilder I think I came up with a patch. I believe it is new cdbs causing this. 1) I didn't manage to install module into two packages 2) mercurial-common would always do dh_install dh_pysupport dh_builddeb before mercurial 3) So I only had a small window in mercurial-common to split arch stuff It builds and dch -c *.deb looks similar to what it was before. Please test and hope this patch will do. ps. flame Bzr rocks!!! /flame Patch below. (hope gmail won't rewrap it). Index: debian/changelog === --- debian/changelog(revision 2804) +++ debian/changelog(working copy) @@ -6,6 +6,9 @@ [ Vincent Danjean ] * Dump Standards-Version (no change needed) + [ Dmitrijs Ledkovs ] + * Fixed FTBS caused by new cleaned-up cdbs + -- Vernon Tang v...@foilhead.net Mon, 06 Apr 2009 19:47:26 +1000 mercurial (1.2-1) unstable; urgency=low Index: debian/mercurial.install === --- debian/mercurial.install(revision 2804) +++ debian/mercurial.install(working copy) @@ -1,5 +1,2 @@ -debian/tmp/usr/bin -debian/tmp/usr/lib - debian/hgext.rc usr/share/mercurial/ debian/hgext.rc.md5sums usr/share/mercurial/ Index: debian/rules === --- debian/rules(revision 2804) +++ debian/rules(working copy) @@ -10,17 +10,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_INSTALL_DOCS_ALL= +DEB_PYTHON_DESTDIR = $(CURDIR)/debian/$(cdbs_curpkg) +DEB_PYTHON_MODULE_PACKAGES = mercurial-common # These part must be run between dh_install and dh_pysupport # So, they must be defined BEFORE including python-distutils.mk -binary-install/mercurial:: - # remove arch-independent python stuff - find debian/mercurial/usr/lib \ - ! -name '*.so' ! -type d -delete , \ - -type d -empty -delete - binary-install/mercurial-common:: - # remove arch-dependent python stuff + # remove arch-independent python stuff + (cd debian/mercurial-common find usr/lib \ + -name '*.so' | cpio -pmd ../mercurial/) find debian/mercurial-common/usr/lib \ -name '*.so' ! -type d -delete , \ -type d -empty -delete Index: debian/mercurial-common.install === --- debian/mercurial-common.install (revision 2804) +++ debian/mercurial-common.install (working copy) @@ -1,5 +1,4 @@ templates usr/share/mercurial -debian/tmp/usr/lib contrib/mercurial.el usr/share/emacs/site-lisp contrib/mq.el usr/share/emacs/site-lisp -- With best regards Dmitrijs Ledkovs (for short Dima), Ледков Дмитрий Юрьевич -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522426: [Python-apps-team] Bug#522426: Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?
tags 522426 patch thanks Fixed a typo in the comment (Removing arch-dep instead of arch-indep). Is this the correct way to attach patches on BTS? (First time submitting a patch to BTS) -- With best regards Dmitrijs Ledkovs (for short Dima), Ледков Дмитрий Юрьевич -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522426: Info received ([Python-apps-team] Bug#522426: Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?)
Index: debian/changelog === --- debian/changelog (revision 2804) +++ debian/changelog (working copy) @@ -6,6 +6,9 @@ [ Vincent Danjean ] * Dump Standards-Version (no change needed) + [ Dmitrijs Ledkovs ] + * Fixed FTBS caused by new cleaned-up cdbs + -- Vernon Tang v...@foilhead.net Mon, 06 Apr 2009 19:47:26 +1000 mercurial (1.2-1) unstable; urgency=low Index: debian/mercurial.install === --- debian/mercurial.install (revision 2804) +++ debian/mercurial.install (working copy) @@ -1,5 +1,2 @@ -debian/tmp/usr/bin -debian/tmp/usr/lib - debian/hgext.rc usr/share/mercurial/ debian/hgext.rc.md5sums usr/share/mercurial/ Index: debian/rules === --- debian/rules (revision 2804) +++ debian/rules (working copy) @@ -10,17 +10,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_INSTALL_DOCS_ALL= +DEB_PYTHON_DESTDIR = $(CURDIR)/debian/$(cdbs_curpkg) +DEB_PYTHON_MODULE_PACKAGES = mercurial-common # These part must be run between dh_install and dh_pysupport # So, they must be defined BEFORE including python-distutils.mk -binary-install/mercurial:: - # remove arch-independent python stuff - find debian/mercurial/usr/lib \ - ! -name '*.so' ! -type d -delete , \ - -type d -empty -delete - binary-install/mercurial-common:: # remove arch-dependent python stuff + (cd debian/mercurial-common find usr/lib \ + -name '*.so' | cpio -pmd ../mercurial/) find debian/mercurial-common/usr/lib \ -name '*.so' ! -type d -delete , \ -type d -empty -delete Index: debian/mercurial-common.install === --- debian/mercurial-common.install (revision 2804) +++ debian/mercurial-common.install (working copy) @@ -1,5 +1,4 @@ templates usr/share/mercurial -debian/tmp/usr/lib contrib/mercurial.el usr/share/emacs/site-lisp contrib/mq.el usr/share/emacs/site-lisp
Bug#522426: Info received ([Python-apps-team] Bug#522426: Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?)
Dmitrijs Ledkovs wrote: --- debian/rules (revision 2804) +++ debian/rules (working copy) @@ -10,17 +10,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_INSTALL_DOCS_ALL= +DEB_PYTHON_DESTDIR = $(CURDIR)/debian/$(cdbs_curpkg) +DEB_PYTHON_MODULE_PACKAGES = mercurial-common # These part must be run between dh_install and dh_pysupport # So, they must be defined BEFORE including python-distutils.mk -binary-install/mercurial:: - # remove arch-independent python stuff - find debian/mercurial/usr/lib \ - ! -name '*.so' ! -type d -delete , \ - -type d -empty -delete - binary-install/mercurial-common:: # remove arch-dependent python stuff + (cd debian/mercurial-common find usr/lib \ + -name '*.so' | cpio -pmd ../mercurial/) find debian/mercurial-common/usr/lib \ -name '*.so' ! -type d -delete , \ -type d -empty -delete Surely this is going to break horribly when building arch-specific binary packages only? What about simply adding: DEB_PYTHON_MODULE_PACKAGES = mercurial mercurial-common ? I agree the mention in the NEWS file that: +As its name indicates, the new variable may support multiple Python +packages in the future. specifically in the future is slightly troubling, and some clarification from the cdbs maintainers would probably be a good thing. However, it seems to work fine, confirmed by diffing the produced binary debs from a build with lenny-cdbs with those from a build with squeeze-cdbs plus that one added line. Max. signature.asc Description: OpenPGP digital signature
Bug#522426: Info received ([Python-apps-team] Bug#522426: Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?)
2009/4/28 Max Bowsher m...@f2s.com: Dmitrijs Ledkovs wrote: --- debian/rules (revision 2804) +++ debian/rules (working copy) @@ -10,17 +10,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_INSTALL_DOCS_ALL= +DEB_PYTHON_DESTDIR = $(CURDIR)/debian/$(cdbs_curpkg) +DEB_PYTHON_MODULE_PACKAGES = mercurial-common # These part must be run between dh_install and dh_pysupport # So, they must be defined BEFORE including python-distutils.mk -binary-install/mercurial:: - # remove arch-independent python stuff - find debian/mercurial/usr/lib \ - ! -name '*.so' ! -type d -delete , \ - -type d -empty -delete - binary-install/mercurial-common:: # remove arch-dependent python stuff + (cd debian/mercurial-common find usr/lib \ + -name '*.so' | cpio -pmd ../mercurial/) find debian/mercurial-common/usr/lib \ -name '*.so' ! -type d -delete , \ -type d -empty -delete Surely this is going to break horribly when building arch-specific binary packages only? Well I'm aware this is a dirty hack... But this is very similar to what was done before. I was more concerned about byte compiling and preinstall / postinstall scripts for python. But this hack is after dh_install and before dh_pysupport. So imho it's an extended dh_install so I think it's alright. What about simply adding: DEB_PYTHON_MODULE_PACKAGES = mercurial mercurial-common ? I was thinking of that, but didn't actually tried it, because of the news file. I agree the mention in the NEWS file that: + As its name indicates, the new variable may support multiple Python + packages in the future. specifically in the future is slightly troubling, and some clarification from the cdbs maintainers would probably be a good thing. I know sounds very early in the release cycle so lets push this this out. I hope there will be more clarity later on.. However, it seems to work fine, confirmed by diffing the produced binary debs from a build with lenny-cdbs with those from a build with squeeze-cdbs plus that one added line. The response on the bug report did say patches welcome to make it build. so yeah that's what I tried to do last night. Max. I'm not running sid so can someone try to build it with this patch and use it / run test suite? Or shall we upload to experimental and wait for bugs? Cause I don't personally use hg for anything yet -- With best regards Dmitrijs Ledkovs (for short Dima), Ледков Дмитрий Юрьевич -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?
hi, Fredrik Jonson wrote: Hi, I'm a debian/unstable hg user. After 3 weeks of bug inactivity and about 6 weeks after the release of hg 1.2.1 I wonder what is the status of bug 522426? The bug mentions some form of build dependency issue, is there any activity on this issue, and are there any other bugs that this issue depends on? There is an issue in the build-tool chain. In fact, the current package (1.2-1) FTBFS (fails to build from source) with the tools in sid. I suspect this is a change in cdbs that trigger this problem. I notice that Ubuntu has built and released[0] a backport of mercurial 1.2.1 that actually is based on debian's mercurial svn repository so I'm a bit surprised to see that the debian release is stalled. They is not much difference in the svn packaging between 1.2 and 1.2.1 (wrt debian packaging). So, environments where 1.2-1 can build are also able to build 1.2.1-1. I'm pretty sure that the svn repo is able to build a 1.2.1-1 in a lenny environment. Two solutions can be done for this bug: - find a small patch so that the current package can build with sid tools - redone the packaging based on dh7 directly (and drop the cdbs dependency) I'm planning to do the second one but I'm missing free time to do it for now. I also will accept any patch that can lead to a package that can be built with current sid tools. [0] https://launchpad.net/~mercurial-releases/+archive/ppa BTW, any plans for a 1.2.1 backport for lenny? Mercurial has acquired a lot of polish and command sanity in the 1.1 and 1.2.1 releases compared to the 1.0.1 release found in debian stable. Yes, I upload mercurial backport to backport.org as soon as I can (ie as soon as it reaches testing). You can use the version in the etch distribution (1.1.2-2~bpo40+1) for now. And 1.2-1 should build on lenny without any problem: apt-get build-dep mercurial apt-get source -b mercurial dpkg -i *.deb Regards, Vincent cheers, -- Vincent Danjean GPG key ID 0x9D025E87 vdanj...@debian.org GPG key fingerprint: FC95 08A6 854D DB48 4B9A 8A94 0BF7 7867 9D02 5E87 Unofficial pacakges: http://moais.imag.fr/membres/vincent.danjean/deb.html APT repo: deb http://perso.debian.org/~vdanjean/debian unstable main -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
