summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-11-24 13:25:39 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-11-24 13:25:39 +0100
commitb90575e96622f14dc3d25972d0498faf0a02259e (patch)
treec3fcaa61d4999a652a808424599b77182f0aaa8e
parent969986c30b34fc47b47a9ca2c9e1cd6ab38fe5ea (diff)
parentbe8fa1ee4581faeadfb6d067301ee9e7761dc1c7 (diff)
downloadpython-apt-b90575e96622f14dc3d25972d0498faf0a02259e.tar.gz
merge from debian
-rw-r--r--data/templates/Debian.info.in6
-rw-r--r--debian/changelog12
2 files changed, 16 insertions, 2 deletions
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index c3ce7fd7..dd040c20 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -20,6 +20,8 @@ _Description: Proposed updates
Suite: lenny/updates
RepositoryType: deb
+BaseURI: http://security.debian.org/
+MatchURI: security\.debian\.org
ParentSuite: lenny
_Description: Security updates
@@ -43,6 +45,8 @@ _Description: Proposed updates
Suite: etch/updates
RepositoryType: deb
+BaseURI: http://security.debian.org/
+MatchURI: security\.debian\.org
ParentSuite: etch
_Description: Security updates
@@ -66,6 +70,8 @@ _Description: Proposed updates
Suite: sarge/updates
RepositoryType: deb
+BaseURI: http://security.debian.org/
+MatchURI: security\.debian\.org
ParentSuite: sarge
_Description: Security updates
diff --git a/debian/changelog b/debian/changelog
index f16964f4..f51cb07a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.7.8) UNRELEASED; urgency=low
+python-apt (0.7.8) unstable; urgency=low
[ Michael Vogt ]
* python/cache.cc:
@@ -34,7 +34,15 @@ python-apt (0.7.8) UNRELEASED; urgency=low
[ Julian Andres Klode ]
* python/acquire.cc (GetPkgAcqFile): Support DestDir and DestFilename.
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 30 Jul 2008 10:24:30 +0200
+ -- Michael Vogt <mvo@debian.org> Mon, 24 Nov 2008 10:24:30 +0200
+
+python-apt (0.7.7.1+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
+ lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
+
+ -- Jonny Lamb <jonny@debian.org> Fri, 24 Oct 2008 12:44:33 +0100
python-apt (0.7.7.1) unstable; urgency=low