summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-07-22 15:58:48 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-07-22 15:58:48 +0200
commit268c7947aa2311682df06bbc70a7c3f5f20d9c1f (patch)
treead303143996714c98428ec1a02b07162fd6d6403 /data
parent989851644e18c6ff446155b5f19d57df2b834253 (diff)
parent5d8dd13ab3d1e6845a061a4d5b871dda87ab4753 (diff)
downloadpython-apt-268c7947aa2311682df06bbc70a7c3f5f20d9c1f.tar.gz
* merged from debian-sid
* data/templates/Debian.info.in: - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673) * python/cache.cc: - Throw an exception rather than segfaulting when GetCache() is called before InitSystem() (closes: #369147) * doc/examples/config.py: - Fix config.py --help (closes: #257007) * python/apt_pkgmodule.cc: - fix bug in hashsum calculation when the original string contains \0 charackters (thanks to Celso Providelo and Ryan Hass for the test-case) LP: #243630 * tests/test_hashsums.py: - add tests for the hashsum code * apt/package.py: - add "isAutoRemovable()" method * python/pkgsrcrecords.cc: - add "Record" attribute to the PkgSrcRecord to access the full source record * debian/rules: - remove the arch-build target, we have bzr-builddeb now
Diffstat (limited to 'data')
-rw-r--r--data/templates/Debian.info.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index 244e1c6b..b635de19 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -3,7 +3,7 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changel
Suite: etch
RepositoryType: deb
BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
_Description: Debian 4.0 'Etch'
Component: main
@@ -26,7 +26,7 @@ _Description: Security updates
Suite: sarge
RepositoryType: deb
BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
_Description: Debian 3.1 'Sarge'
Component: main
@@ -49,7 +49,7 @@ _Description: Security updates
Suite: stable
RepositoryType: deb
BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
_Description: Debian current stable release
Component: main
@@ -62,7 +62,7 @@ _CompDescription: Non-DFSG-compatible Software
Suite: testing
RepositoryType: deb
BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
_Description: Debian testing
Component: main
@@ -75,7 +75,7 @@ _CompDescription: Non-DFSG-compatible Software
Suite: sid
RepositoryType: deb
BaseURI: http://http.us.debian.org/debian/
-MatchUri: ftp[0-9]*\.[a-z]\.debian\.org
+MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
_Description: Debian 'Sid' (unstable)
Component: main