Package: deluge
Version: 1.1.3+dfsg-1ubuntu1
Severity: wishlist
Tags: patch


The following patch has been used in Ubuntu for the
Python 2.6 transition. I'm not sure when Debian will
under go the transition, but I hope you find this
helpfull. It should be backwards compatable.

diff -u deluge-1.1.3+dfsg/debian/deluge-console.install 
deluge-1.1.3+dfsg/debian/deluge-console.install
--- deluge-1.1.3+dfsg/debian/deluge-console.install
+++ deluge-1.1.3+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.3+dfsg/debian/deluge-core.install 
deluge-1.1.3+dfsg/debian/deluge-core.install
--- deluge-1.1.3+dfsg/debian/deluge-core.install
+++ deluge-1.1.3+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
diff -u deluge-1.1.3+dfsg/debian/deluge-webui.install 
deluge-1.1.3+dfsg/debian/deluge-webui.install
--- deluge-1.1.3+dfsg/debian/deluge-webui.install
+++ deluge-1.1.3+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.3+dfsg/debian/deluge.install 
deluge-1.1.3+dfsg/debian/deluge.install
--- deluge-1.1.3+dfsg/debian/deluge.install
+++ deluge-1.1.3+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.3+dfsg/debian/rules deluge-1.1.3+dfsg/debian/rules
--- deluge-1.1.3+dfsg/debian/rules
+++ deluge-1.1.3+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.3+dfsg/debian/deluge-common.install 
deluge-1.1.3+dfsg/debian/deluge-common.install
--- deluge-1.1.3+dfsg/debian/deluge-common.install
+++ deluge-1.1.3+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

-- System Information:
Debian Release: 5.0
  APT prefers jaunty-updates
  APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 'jaunty')
Architecture: i386 (i686)

Kernel: Linux 2.6.28-9-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages deluge depends on:
ii  dbus-x11             1.2.12-0ubuntu2     simple interprocess messaging syst
ii  deluge-common        1.1.3+dfsg-1ubuntu1 bittorrent client written in Pytho
ii  librsvg2-common      2.22.3-2            SAX-based renderer library for SVG
ii  notify-osd [notifica 0.9.3-0ubuntu1      daemon that displays passive pop-u
ii  python               2.6.1-0ubuntu3      An interactive high-level object-o
ii  python-dbus          0.83.0-1ubuntu1     simple interprocess messaging syst
ii  python-glade2        2.14.1-0ubuntu1     GTK+ bindings: Glade support
ii  python-notify        0.1.1-2build2       Python bindings for libnotify
ii  python-support       0.8.7ubuntu2        automated rebuilding support for P

deluge recommends no packages.

deluge suggests no packages.

-- no debconf information
diff -u deluge-1.1.3+dfsg/debian/deluge-console.install deluge-1.1.3+dfsg/debian/deluge-console.install
--- deluge-1.1.3+dfsg/debian/deluge-console.install
+++ deluge-1.1.3+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.3+dfsg/debian/deluge-core.install deluge-1.1.3+dfsg/debian/deluge-core.install
--- deluge-1.1.3+dfsg/debian/deluge-core.install
+++ deluge-1.1.3+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
diff -u deluge-1.1.3+dfsg/debian/deluge-webui.install deluge-1.1.3+dfsg/debian/deluge-webui.install
--- deluge-1.1.3+dfsg/debian/deluge-webui.install
+++ deluge-1.1.3+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.3+dfsg/debian/deluge.install deluge-1.1.3+dfsg/debian/deluge.install
--- deluge-1.1.3+dfsg/debian/deluge.install
+++ deluge-1.1.3+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.3+dfsg/debian/rules deluge-1.1.3+dfsg/debian/rules
--- deluge-1.1.3+dfsg/debian/rules
+++ deluge-1.1.3+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.3+dfsg/debian/deluge-common.install deluge-1.1.3+dfsg/debian/deluge-common.install
--- deluge-1.1.3+dfsg/debian/deluge-common.install
+++ deluge-1.1.3+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

Reply via email to