diff -Nru urwid-1.0.1/debian/changelog urwid-1.0.1/debian/changelog --- urwid-1.0.1/debian/changelog 2011-12-11 22:49:31.000000000 +0000 +++ urwid-1.0.1/debian/changelog 2012-10-26 12:37:03.000000000 +0000 @@ -1,3 +1,9 @@ +urwid (1.0.1-2ubuntu1) raring; urgency=low + + * Fix 50 shades of python2,3 brokenness with cdbs. + + -- Dmitrijs Ledkovs Fri, 26 Oct 2012 13:36:25 +0100 + urwid (1.0.1-2) unstable; urgency=low * generate python3 package as well, closes #640127 diff -Nru urwid-1.0.1/debian/control urwid-1.0.1/debian/control --- urwid-1.0.1/debian/control 2011-12-11 22:51:08.000000000 +0000 +++ urwid-1.0.1/debian/control 2012-10-26 12:39:50.000000000 +0000 @@ -1,7 +1,8 @@ Source: urwid Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Gustavo Franco , Ian Ward Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.90~), python-setuptools (>= 0.6.16), python-all-dev (>= 2.6.6-3~), python-templayer, python-gobject, python-twisted, python3-all-dev (>= 3.2), python3-setuptools Standards-Version: 3.9.2 diff -Nru urwid-1.0.1/debian/rules urwid-1.0.1/debian/rules --- urwid-1.0.1/debian/rules 2011-12-11 22:49:31.000000000 +0000 +++ urwid-1.0.1/debian/rules 2012-10-26 12:48:35.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL=/usr/lib/@PYTHONBINARY@/dist-packages/ +DEB_PYTHON_INSTALL_ARGS_ALL=--prefix=/usr --no-compile -O0 --install-layout=deb include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_CHANGELOGS_ALL=CHANGELOG @@ -13,8 +15,13 @@ touch build-docs-test-stamp install/python-urwid:: - chmod a+x debian/tmp/usr/lib/python*/site-packages/urwid/*.py - chmod a-x debian/tmp/usr/lib/python*/site-packages/urwid/version.py + chmod a+x debian/tmp/usr/lib/python*/dist-packages/urwid/*.py + chmod a-x debian/tmp/usr/lib/python*/dist-packages/urwid/version.py + +install/python3-urwid:: + mv debian/tmp/usr/lib/$(shell py3versions -d) debian/tmp/usr/lib/python3 + -cp debian/tmp/usr/lib/python3.*/dist-packages/urwid/*.so debian/tmp/usr/lib/python3/dist-packages/urwid/ + rm -rf debian/tmp/usr/lib/python3.* clean:: - rm -rf build build-docs-test-stamp + rm -rf build build-docs-test-stamp *.egg-info urwid/*.so