summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-07-24 22:35:28 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-07-24 22:35:28 +0200
commit316789f0e803bd5266f3868743f30f10245a6261 (patch)
tree60a601de52e6b5b8a02813100d677620e15a7f00
parent1ae3c6c410ae468ae5a580910ecd74d93c9e8ac2 (diff)
downloadpython-apt-316789f0e803bd5266f3868743f30f10245a6261.tar.gz
* merged the NMUs from debian
-rw-r--r--debian/changelog23
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules4
3 files changed, 22 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 9f681950..456fb544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,24 @@ python-apt (0.6.19) unstable; urgency=low
- fix commit doc string to also cite the open related callbacks
- allow change of rootdir for APT database loading
- add dh_installexamples in package building
-
- --
+
+ --
+
+python-apt (0.6.18-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add ${shlibs:Depends} and ${misc:Depends} (Closes: #377615).
+
+ -- Christoph Berg <myon@debian.org> Tue, 18 Jul 2006 11:39:52 +0200
+
+python-apt (0.6.18-0.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Call dh_pycentral and dh_python before dh_installdeb, to make sure
+ the dh_pycentral snippets are put into the maintainer scripts; patch from
+ Sam Morris. (Closes: #376416)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Wed, 12 Jul 2006 23:26:50 +0200
python-apt (0.6.18) unstable; urgency=low
@@ -37,7 +53,6 @@ python-apt (0.6.17) unstable; urgency=low
- fix various pychecker warnings
- check if looupRecords succeeded
- fix bug in the return statement of _downloadable()
- * apt/cache.py:
* python/srcrecords.cc:
- add "Restart" method
- don't run auto "Restart" before performing a Lookup
@@ -46,7 +61,7 @@ python-apt (0.6.17) unstable; urgency=low
* python/indexfile.cc:
- added ArchiveURI() method
- -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:34:58 +0200
+ -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:34:58 +0200
python-apt (0.6.16.2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f313dff5..5fa1bc83 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.40), apt-utils, p
Package: python-apt
Architecture: any
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Priority: optional
Replaces: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
Conflicts: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
diff --git a/debian/rules b/debian/rules
index 6a187e7f..ee159b89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,13 +53,13 @@ binary-arch: build
dh_installdocs
dh_installchangelogs
dh_installexamples
+ dh_pycentral
+ dh_python
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_pycentral
- dh_python
dh_gencontrol
dh_md5sums
dh_builddeb