summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt/cdrom.py4
-rw-r--r--debian/changelog10
-rwxr-xr-xdebian/rules2
3 files changed, 14 insertions, 2 deletions
diff --git a/apt/cdrom.py b/apt/cdrom.py
index d499b30a..8d73339c 100644
--- a/apt/cdrom.py
+++ b/apt/cdrom.py
@@ -1,6 +1,6 @@
import apt_pkg
-from apt.progress import CdromProgress
+from progress import CdromProgress
class Cdrom(object):
def __init__(self, progress=None, mountpoint=None, nomount=True):
@@ -12,7 +12,7 @@ class Cdrom(object):
"""
self._cdrom = apt_pkg.GetCdrom()
if progress is None:
- self._progress = apt.progress.CdromProgress()
+ self._progress = CdromProgress()
else:
self._progress = progress
# see if we have a alternative mountpoint
diff --git a/debian/changelog b/debian/changelog
index 5e648c93..c67bc8ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+python-apt (0.6.20ubuntu12) feisty; urgency=low
+
+ * apt/cdrom.py:
+ - fix bug in cdrom __init__ code
+ * debian/rules:
+ - added "DH_PYCENTRAL=nomove"
+
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Mar 2007 10:41:00 +0100
+
python-apt (0.6.20ubuntu11) feisty; urgency=low
* apt/packages.py:
diff --git a/debian/rules b/debian/rules
index 63c9bc3b..33d04a21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
DEB_AUTO_CLEANUP_RCS := yes
DEB_PYTHON_SYSTEM=pycentral
+export DH_PYCENTRAL=nomove
+
DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg
# Add here any variable or target overrides you need