[Python-apps-team] Bug#522426: Bug#522426: Status on debian bug #522426 (Mercurial 1.2.1)?

[Dmitrijs Ledkovs]

2009/4/27 Vincent Danjean <vdanjean at 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 <vt at 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),
Ледков Дмитрий Юрьевич