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
