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

diff --git a/debian/changelog b/debian/changelog
index 49f4c16e117cbe681daea7144d9422d35706097b..8d1f98f101b12cc388787a0f06ae8f148e8da2c0 100644 (file)
--- 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 a43a08057aca02ccef4945738312366d9a2635fc..e8ab6aee6885542e3da9e47b16a26fbc6ef55306 100755 (executable)
--- 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 9c675d403c37123b4e244cf594dd429bac88da71..d52909f10f267df81bf4980a47218a73f620648b 100644 (file)
--- 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