diff -Nru canto-0.7.10/debian/changelog canto-0.7.10/debian/changelog --- canto-0.7.10/debian/changelog 2011-10-01 22:37:22.000000000 +0000 +++ canto-0.7.10/debian/changelog 2011-11-17 19:07:39.000000000 +0000 @@ -1,3 +1,16 @@ +canto (0.7.10-2ubuntu1) precise; urgency=low + + * debian/control: + - revert Debian changes and change Build-Depends back to python-dev: we + already have the fix for bdo 643974. + - drop the python-support Build-Depends. + * debian/rules: + - again, revert Debian changes and use just python instead of python2.6. + - drop the override for dh_pysupport. + - use the dh sequencer with --with python2. + + -- Mathieu Trudel-Lapierre Thu, 17 Nov 2011 12:05:25 -0500 + canto (0.7.10-2) unstable; urgency=low * Team upload. diff -Nru canto-0.7.10/debian/control canto-0.7.10/debian/control --- canto-0.7.10/debian/control 2011-10-01 20:55:03.000000000 +0000 +++ canto-0.7.10/debian/control 2011-11-17 19:07:39.000000000 +0000 @@ -1,9 +1,10 @@ Source: canto Section: net Priority: optional -Maintainer: Python Applications Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Python Applications Packaging Team Uploaders: Vincent Legout -Build-Depends: debhelper (>= 7.0.50~), python2.6-dev, python-support, libncurses5-dev, libncursesw5-dev +Build-Depends: debhelper (>= 7.0.50~), python-dev (>= 2.6.6-3~), libncurses5-dev, libncursesw5-dev Standards-Version: 3.9.1 Homepage: http://www.codezen.org/canto/ Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/canto/ diff -Nru canto-0.7.10/debian/rules canto-0.7.10/debian/rules --- canto-0.7.10/debian/rules 2011-10-01 20:55:03.000000000 +0000 +++ canto-0.7.10/debian/rules 2011-11-17 19:07:39.000000000 +0000 @@ -3,13 +3,13 @@ -include /usr/share/python/python.mk %: - dh ${@} + dh ${@} --with python2 override_dh_auto_build: - python2.6 setup.py build --force + python setup.py build --force override_dh_auto_install: - python2.6 setup.py install --root=debian/canto --no-compile $(py_setup_install_args) \ + python setup.py install --root=debian/canto --no-compile $(py_setup_install_args) \ --install-lib=/usr/lib/canto --install-scripts=/usr/lib/canto/bin mv $(CURDIR)/debian/canto//usr/lib/canto/bin/canto \ $(CURDIR)/debian/canto/usr/lib/canto/canto-bin @@ -20,9 +20,6 @@ rm -rf $(CURDIR)/debian/canto/usr/lib/canto/bin rm -rf $(CURDIR)/debian/canto/usr/lib/canto/canto/feedparser_builtin.py -override_dh_pysupport: - dh_pysupport -V2.6 - override_dh_link: dh_link /usr/lib/canto/canto-bin /usr/bin/canto dh_link /usr/lib/canto/canto-fetch /usr/bin/canto-fetch