diff -Nru synce-kpm-0.15/debian/changelog synce-kpm-0.15/debian/changelog --- synce-kpm-0.15/debian/changelog 2010-05-12 17:52:25.000000000 +0200 +++ synce-kpm-0.15/debian/changelog 2010-06-05 00:49:53.000000000 +0200 @@ -1,3 +1,9 @@ +synce-kpm (0.15-1ubuntu1) maverick; urgency=low + + * Fix FTBFS due to changed options since Python 2.6 (LP: #589908) + + -- Jean-Louis Dupond Sat, 05 Jun 2010 00:49:29 +0200 + synce-kpm (0.15-1) unstable; urgency=low * New upstream release. diff -Nru synce-kpm-0.15/debian/control synce-kpm-0.15/debian/control --- synce-kpm-0.15/debian/control 2010-05-12 17:52:25.000000000 +0200 +++ synce-kpm-0.15/debian/control 2010-06-05 00:50:32.000000000 +0200 @@ -1,5 +1,6 @@ Source: synce-kpm -Maintainer: Jonny Lamb +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonny Lamb Section: python Priority: optional Build-Depends: debhelper (>= 5.0) diff -Nru synce-kpm-0.15/debian/rules synce-kpm-0.15/debian/rules --- synce-kpm-0.15/debian/rules 2010-05-12 17:52:25.000000000 +0200 +++ synce-kpm-0.15/debian/rules 2010-06-05 00:49:27.000000000 +0200 @@ -2,6 +2,7 @@ PYVER=$(shell python -c 'import sys; print sys.version[:3]') +-include /usr/share/python/python.mk include $(CURDIR)/debian/update-patches.mk clean: @@ -25,11 +26,12 @@ dh_clean -k dh_installdirs python setup.py install \ + $(py_setup_install_args) \ --root=$(CURDIR)/debian/synce-kpm \ --single-version-externally-managed \ mkdir -p $(CURDIR)/debian/synce-kpm/usr/share/synceKPM - mv $(CURDIR)/debian/synce-kpm/usr/lib/python$(PYVER)/site-packages/synceKPM/data \ + mv $(CURDIR)/debian/synce-kpm/usr/lib/python$(PYVER)/*-packages/synceKPM/data \ $(CURDIR)/debian/synce-kpm/usr/share/synceKPM binary-indep: build install