From 24971a75407f0b28f2cb4e890545a0f5825af87d Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 13 Feb 2010 17:27:59 +0100 Subject: * data/templates/*.in: Switch MirrorsFile to relative filenames. - setup.py: Copy the mirror lists to the build directory - aptsources/distinfo.py: Support relative filenames for MirrorsFile. --- data/templates/Debian.info.in | 16 ++++++++-------- data/templates/Ubuntu.info.in | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'data') diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index 9ea368d6..b9f70940 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -4,7 +4,7 @@ Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian 6.0 'Squeeze' Component: main _CompDescription: Officially supported @@ -29,7 +29,7 @@ Suite: lenny RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian 5.0 'Lenny' Component: main _CompDescription: Officially supported @@ -54,7 +54,7 @@ Suite: etch RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian 4.0 'Etch' Component: main _CompDescription: Officially supported @@ -79,7 +79,7 @@ Suite: sarge RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian 3.1 'Sarge' Component: main _CompDescription: Officially supported @@ -104,7 +104,7 @@ Suite: stable RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian current stable release Component: main _CompDescription: Officially supported @@ -117,7 +117,7 @@ Suite: testing RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian testing Component: main _CompDescription: Officially supported @@ -130,7 +130,7 @@ Suite: sid RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian 'Sid' (unstable) Component: main _CompDescription: Officially supported @@ -143,7 +143,7 @@ Suite: unstable RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org -MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors +MirrorsFile: Debian.mirrors _Description: Debian 'Sid' (unstable) Component: main _CompDescription: Officially supported diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 2335454f..1ca76927 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -8,8 +8,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors -MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' Component: main _CompDescription: Officially supported @@ -69,8 +69,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors -MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.10 'Karmic Koala' Component: main _CompDescription: Officially supported @@ -130,8 +130,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors -MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.04 'Jaunty Jackalope' Component: main _CompDescription: Officially supported @@ -191,8 +191,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors -MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported @@ -253,8 +253,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors -MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported @@ -309,7 +309,7 @@ Suite: gutsy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.10 'Gutsy Gibbon' Component: main _CompDescription: Officially supported @@ -362,7 +362,7 @@ Suite: feisty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.04 'Feisty Fawn' Component: main _CompDescription: Officially supported @@ -414,7 +414,7 @@ Suite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.10 'Edgy Eft' Component: main _CompDescription: Officially supported @@ -466,7 +466,7 @@ Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main _CompDescription: Officially supported @@ -518,7 +518,7 @@ Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 5.10 'Breezy Badger' Component: main _CompDescription: Officially supported @@ -561,7 +561,7 @@ Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu -MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main _CompDescription: Officially supported -- cgit v1.2.3