diff -u pysvn-1.7.0/debian/changelog pysvn-1.7.0/debian/changelog --- pysvn-1.7.0/debian/changelog +++ pysvn-1.7.0/debian/changelog @@ -1,3 +1,12 @@ +pysvn (1.7.0-1ubuntu2) karmic; urgency=low + + * updated debin/rules to install files into + /usr/lib/python2.6/dist-packages, fixes FTBFS. (LP: #426677) + * Removed DH_PYCENTRAL=nomove from debian/rules. + * Added python-central to debian/control Build-Depends. + + -- Charlie Smotherman Wed, 09 Sep 2009 16:22:22 -0500 + pysvn (1.7.0-1ubuntu1) karmic; urgency=low * Tighten build-dependency on libsvncpp-dev. diff -u pysvn-1.7.0/debian/rules pysvn-1.7.0/debian/rules --- pysvn-1.7.0/debian/rules +++ pysvn-1.7.0/debian/rules @@ -102,17 +102,24 @@ install-stamp: build-stamp install-pre $(PYVERS:%=install-python%) $(PYVERS:%=dbg-install-python%) install-python%: dh_installdirs -ppython-svn \ - usr/lib/python$*/site-packages/pysvn - install -d $(d)/usr/lib/python$*/site-packages/pysvn/ - cp -p _pysvn_$(subst .,_,$*).so $(d)/usr/lib/python$*/site-packages/pysvn/ - cp -p __init__$(subst .,_,$*).py $(d)/usr/lib/python$*/site-packages/pysvn/__init__.py - + usr/lib/python2.5/site-packages/pysvn + install -d $(d)/usr/lib/python2.5/site-packages/pysvn/ + cp -p _pysvn_2_5.so $(d)/usr/lib/python2.5/site-packages/pysvn/ + cp -p __init__2_5.py $(d)/usr/lib/python2.5/site-packages/pysvn/ + dh_installdirs -ppython-svn \ + usr/lib/python2.6/dist-packages/pysvn + install -d $(d)/usr/lib/python2.6/dist-packages/pysvn/ + cp -p _pysvn_2_6.so $(d)/usr/lib/python2.6/dist-packages/pysvn/ + cp -p __init__2_6.py $(d)/usr/lib/python2.6/dist-packages/pysvn/ -find $(d) -name .svn | xargs rm -rf dbg-install-python%: dh_installdirs -ppython-svn-dbg \ - usr/lib/python$*/site-packages/pysvn - cp -p _pysvn_$(subst .,_,$*)_d.so $(d)-dbg/usr/lib/python$*/site-packages/pysvn/ + usr/lib/python2.5/site-packages/pysvn + cp -p _pysvn_2_5_d.so $(d)-dbg/usr/lib/python2.5/site-packages/pysvn/ + dh_installdirs -ppython-svn-dbg \ + usr/lib/python2.6/dist-packages/pysvn + cp -p _pysvn_2_6_d.so $(d)-dbg/usr/lib/python2.6/dist-packages/pysvn/ -find $(d)-dbg -name .svn | xargs rm -rf # Build architecture independant packages using the common target. @@ -132,6 +139,8 @@ dh_compress -a -X.py -X.sxw dh_fixperms -a DH_PYCENTRAL=nomove dh_pycentral -a -v + mv $(d)/usr/lib/python2.5/site-packages/pysvn/__init__2_5.py $(d)/usr/lib/python2.5/site-packages/pysvn/__init__.py + mv $(d)/usr/lib/python2.6/dist-packages/pysvn/__init__2_6.py $(d)/usr/lib/python2.6/dist-packages/pysvn/__init__.py dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a diff -u pysvn-1.7.0/debian/control pysvn-1.7.0/debian/control --- pysvn-1.7.0/debian/control +++ pysvn-1.7.0/debian/control @@ -1,8 +1,9 @@ Source: pysvn Section: python Priority: optional -Maintainer: Matthias Klose -Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-cxx-dev (>= 5.5), libsvncpp-dev (>= 0.10), libapr1-dev, libneon27-gnutls-dev, subversion (>= 1.5.0) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-cxx-dev (>= 5.5), libsvncpp-dev (>= 0.10), libapr1-dev, libneon27-gnutls-dev, subversion (>= 1.5.0), python-central XS-Python-Version: all Standards-Version: 3.8.3 Homepage: http://pysvn.tigris.org/