summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:55:43 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:55:43 +0000
commitaa6e3431719da89d4beadf8fc81e5236f697d405 (patch)
treebc3c24c8898e95afe726baaab4a6584db4a5e5cd
parentbd6bafe59287da74fe48a3e332419196edf58907 (diff)
Fixed to new security and non-us urls
Author: jgg Date: 2000-01-21 07:29:55 GMT Fixed to new security and non-us urls
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/postinst16
-rw-r--r--doc/examples/sources.list6
3 files changed, 6 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 49f4c16e1..8d1f98f10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apt (0.3.16.1) unstable; urgency=low
* Included the configure-index example
* Minimal CD swaps
* Library soname has increased
+ * Fixed default sources.list to have correct URLs for potato when it becomes
+ stable
-- Ben Gertzfield <che@debian.org> Fri, 14 Jan 2000 08:04:15 -0800
diff --git a/debian/postinst b/debian/postinst
index a43a08057..e8ab6aee6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -14,21 +14,7 @@ create_apt_conf ()
{
echo "/etc/apt/sources.list does not exist; creating a default setup."
- cat > /etc/apt/sources.list <<EOF
-# See sources.list(5) for more information, especialy
-# Remember that you can only use http, ftp or file URIs
-# CDROMs are managed throught the apt-cdrom tool.
-# Proxy configuration is covered through environment variables or
-#
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://non-us.debian.org/debian-non-US stable non-US
-deb http://security.debian.org stable updates
-
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable non-US
-
-EOF
+ cp /usr/doc/apt/examples/sources.list /etc/apt/sources.list
}
check_apt_conf ()
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9c675d403..d52909f10 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -3,10 +3,10 @@
# deb file:/your/mirror/here/debian stable main contrib non-free
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
-# CDROMs are managed throught the apt-cdrom tool.
+# CDROMs are managed through the apt-cdrom tool.
deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://non-us.debian.org/debian-non-US stable non-US
-deb http://security.debian.org stable updates
+deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+deb http://security.debian.org stable/updates main contrib non-free
# Uncomment if you want the apt-get source function to work
#deb-src http://http.us.debian.org/debian stable main contrib non-free