diff -u deluge-1.1.6+dfsg/debian/deluge-console.install deluge-1.1.6+dfsg/debian/deluge-console.install --- deluge-1.1.6+dfsg/debian/deluge-console.install +++ deluge-1.1.6+dfsg/debian/deluge-console.install @@ -1 +1 @@ -usr/lib/python2.5/site-packages/deluge/ui/console/* +usr/lib/python*/*-packages/deluge/ui/console/* diff -u deluge-1.1.6+dfsg/debian/deluge-common.install deluge-1.1.6+dfsg/debian/deluge-common.install --- deluge-1.1.6+dfsg/debian/deluge-common.install +++ deluge-1.1.6+dfsg/debian/deluge-common.install @@ -1,4 +1,4 @@ usr/bin/deluge -usr/lib/python2.5/site-packages/deluge/ui/*.py -usr/lib/python2.5/site-packages/deluge/data/pixmaps/* +usr/lib/python*/*-packages/deluge/ui/*.py +usr/lib/python*/*-packages/deluge/data/pixmaps/* usr/share/man/man1/deluge.1 diff -u deluge-1.1.6+dfsg/debian/changelog deluge-1.1.6+dfsg/debian/changelog --- deluge-1.1.6+dfsg/debian/changelog +++ deluge-1.1.6+dfsg/debian/changelog @@ -1,3 +1,12 @@ +deluge (1.1.6+dfsg-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #357126), remaining changes: + - Python 2.6 transition (LP: #359404): + + debian/*.intall: Install to usr/lib/python*/*-packages/ + + debian/rules: Pass --install-layout=deb to setup.py + + -- Andrew Starr-Bochicchio Fri, 10 Apr 2009 19:54:29 +0100 + deluge (1.1.6+dfsg-2) unstable; urgency=low * debian/patches: new patch 20-fix-segfault-utf8.dpatch, should fix segfault @@ -5,6 +14,15 @@ -- Cristian Greco Fri, 10 Apr 2009 01:59:22 +0200 +deluge (1.1.6+dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #357126), remaining changes: + - Python 2.6 transition (LP: #336229): + + debian/*.intall: Install to usr/lib/python*/*-packages/ + + debian/rules: Pass --install-layout=deb to setup.py + + -- Andrew Starr-Bochicchio Tue, 07 Apr 2009 12:19:45 -0400 + deluge (1.1.6+dfsg-1) unstable; urgency=low * New upstream version. @@ -14,6 +32,15 @@ -- Cristian Greco Tue, 07 Apr 2009 01:18:05 +0200 +deluge (1.1.5+dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #340481), remaining changes: + - Python 2.6 transition (LP: #336229): + + debian/*.intall: Install to usr/lib/python*/*-packages/ + + debian/rules: Pass --install-layout=deb to setup.py + + -- Andrew Starr-Bochicchio Wed, 18 Mar 2009 10:55:02 +0000 + deluge (1.1.5+dfsg-1) unstable; urgency=low * New upstream version. @@ -42,6 +69,15 @@ -- Cristian Greco Sun, 08 Mar 2009 20:44:36 +0100 +deluge (1.1.3+dfsg-1ubuntu1) jaunty; urgency=low + + * debian/*.intall: + - Install to usr/lib/python*/*-packages/ for python 2.6 transition (LP: #336229). + * debian/rules: + - Pass --install-layout=deb to setup.py + + -- Andrew Starr-Bochicchio Mon, 02 Mar 2009 19:16:28 -0500 + deluge (1.1.3+dfsg-1) experimental; urgency=low * New upstream version. @@ -351,0 +388 @@ + diff -u deluge-1.1.6+dfsg/debian/deluge-webui.install deluge-1.1.6+dfsg/debian/deluge-webui.install --- deluge-1.1.6+dfsg/debian/deluge-webui.install +++ deluge-1.1.6+dfsg/debian/deluge-webui.install @@ -1,4 +1,4 @@ -usr/lib/python2.5/site-packages/deluge/ui/webui/*.py -usr/lib/python2.5/site-packages/deluge/ui/webui/lib/* -usr/lib/python2.5/site-packages/deluge/ui/webui/static/* -usr/lib/python2.5/site-packages/deluge/ui/webui/templates/* +usr/lib/python*/*-packages/deluge/ui/webui/*.py +usr/lib/python*/*-packages/deluge/ui/webui/lib/* +usr/lib/python*/*-packages/deluge/ui/webui/static/* +usr/lib/python*/*-packages/deluge/ui/webui/templates/* diff -u deluge-1.1.6+dfsg/debian/control deluge-1.1.6+dfsg/debian/control --- deluge-1.1.6+dfsg/debian/control +++ deluge-1.1.6+dfsg/debian/control @@ -1,7 +1,8 @@ Source: deluge Section: net Priority: optional -Maintainer: Cristian Greco +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Cristian Greco Build-Depends: debhelper (>= 7), dpatch Build-Depends-Indep: python-dev, python-support (>= 0.7.1), diff -u deluge-1.1.6+dfsg/debian/deluge.install deluge-1.1.6+dfsg/debian/deluge.install --- deluge-1.1.6+dfsg/debian/deluge.install +++ deluge-1.1.6+dfsg/debian/deluge.install @@ -1,4 +1,4 @@ -usr/lib/python2.5/site-packages/deluge/ui/gtkui/* +usr/lib/python*/*-packages/deluge/ui/gtkui/* usr/share/applications/deluge.desktop usr/share/icons/* usr/share/pixmaps/* diff -u deluge-1.1.6+dfsg/debian/rules deluge-1.1.6+dfsg/debian/rules --- deluge-1.1.6+dfsg/debian/rules +++ deluge-1.1.6+dfsg/debian/rules @@ -13,7 +13,9 @@ install: build install-stamp install-stamp: - dh install + dh install --before dh_auto_install + python setup.py install --root=$(CURDIR) --install-layout=deb + dh install --after dh_auto_install touch $@ binary-indep: build install diff -u deluge-1.1.6+dfsg/debian/deluge-core.install deluge-1.1.6+dfsg/debian/deluge-core.install --- deluge-1.1.6+dfsg/debian/deluge-core.install +++ deluge-1.1.6+dfsg/debian/deluge-core.install @@ -1,8 +1,8 @@ usr/bin/deluged -usr/lib/python2.5/site-packages/*.egg-info -usr/lib/python2.5/site-packages/deluge/*.py -usr/lib/python2.5/site-packages/deluge/core/* -usr/lib/python2.5/site-packages/deluge/data/GeoIP.dat -usr/lib/python2.5/site-packages/deluge/i18n/* -usr/lib/python2.5/site-packages/deluge/plugins/* +usr/lib/python*/*-packages/*.egg-info +usr/lib/python*/*-packages/deluge/*.py +usr/lib/python*/*-packages/deluge/core/* +usr/lib/python*/*-packages/deluge/data/GeoIP.dat +usr/lib/python*/*-packages/deluge/i18n/* +usr/lib/python*/*-packages/deluge/plugins/* usr/share/man/man1/deluged.1