Merge remote-tracking branch 'mvo/feature/update-by-hash' into debian/experimental

[apt.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 5b0e73b28406a2b125a6adee0ea228e90efc612f..1588f524123203701470750f6dac2e7678c67db4 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,19 +12,10 @@ set -e
 
 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
-
-EOF
+ EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list
+ if [ -f $EXAMPLE_SOURCE ]; then
+     cp $EXAMPLE_SOURCE /etc/apt/sources.list
+ fi
 }
  
 check_apt_conf ()
@@ -33,22 +24,16 @@ check_apt_conf ()
  # this is for future expansion
 }
 
+#DEBHELPER#
+
 case "$1" in
        configure)
-              ldconfig
               #
                # If there is no /etc/apt/sources.list then create a default
               #
               if [ ! -f /etc/apt/sources.list ]; then
                 create_apt_conf
-                echo
-                echo "If you wish to change the default sites from which APT fetches Debian"
-                echo "packages, please edit the file /etc/apt/sources.list."
               else
                 check_apt_conf
               fi
-              if [ -f /usr/sbin/dhelp_parse ]; then
-                /usr/sbin/dhelp_parse -a /usr/doc/apt
-              fi
 esac
-