diff -u pastescript-1.7.3/debian/changelog pastescript-1.7.3/debian/changelog --- pastescript-1.7.3/debian/changelog +++ pastescript-1.7.3/debian/changelog @@ -1,3 +1,12 @@ +pastescript (1.7.3-2ubuntu1) jaunty; urgency=low + + * debian/rules: + - Include /usr/share/python/python.mk. + - Use py_sitename, py_setup_install_args macros to build with Python 2.6, + fix FTBFS (LP: #359482). + + -- Alessio Treglia Sat, 11 Apr 2009 10:28:13 +0200 + pastescript (1.7.3-2) unstable; urgency=low * Change Debian packaging license to MIT (to match upstream) diff -u pastescript-1.7.3/debian/rules pastescript-1.7.3/debian/rules --- pastescript-1.7.3/debian/rules +++ pastescript-1.7.3/debian/rules @@ -6,6 +6,7 @@ PYVERS=$(shell pyversions -vr) PKGDIR=$(CURDIR)/debian/python-pastescript +include /usr/share/python/python.mk include /usr/share/dpatch/dpatch.make clean: unpatch @@ -43,11 +44,11 @@ install-python%: patch python$* setup.py install \ --single-version-externally-managed \ - --root $(PKGDIR) + --root $(PKGDIR) $(py_setup_install_args) # pth file is not needed since all paste* packages are installed in the same directory - rm -f $(PKGDIR)/usr/lib/python$*/site-packages/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth + rm -f $(PKGDIR)/usr/lib/python$*/$(call py_sitename, $*)/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth # python-support's namespace feature will handle this - rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/__init__.py + rm -f $(PKGDIR)/usr/lib/python$*/$(call py_sitename, $*)/paste/__init__.py # create /usr/bin/pasterX.Y symlink install -m 755 $(CURDIR)/scripts/paster $(PKGDIR)/usr/bin/paster$* sed -i -e '1s,usr/bin/.*,usr/bin/python$*,' $(PKGDIR)/usr/bin/paster$* diff -u pastescript-1.7.3/debian/control pastescript-1.7.3/debian/control --- pastescript-1.7.3/debian/control +++ pastescript-1.7.3/debian/control @@ -1,7 +1,8 @@ Source: pastescript Section: python Priority: optional -Maintainer: Piotr Ożarowski +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Piotr Ożarowski Uploaders: Debian Python Modules Team Build-Depends: debhelper (>= 5), dpatch Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),