[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
repos_regexp="
-^deb .*tp://security.debian.org lenny/updates main contrib non-free
-^deb .*tp://ftp.carnet.hr/.*debian lenny main contrib non-free
-^deb .*tp://ftp.carnet.hr/carnet-debian lenny main non-free"
+^deb .*tp://security.debian.org.* lenny/updates main contrib non-free
+^deb .*tp://ftp.carnet.hr/.*debian.* lenny main contrib non-free
+^deb .*tp://ftp.carnet.hr/carnet-debian.* lenny main non-free"
repos="
-1 deb http://security.debian.org lenny/updates main contrib non-free
-2 deb http://ftp.carnet.hr/debian lenny main contrib non-free
-3 deb http://ftp.carnet.hr/carnet-debian lenny main non-free"
+1 deb http://security.debian.org/ lenny/updates main contrib non-free
+2 deb http://ftp.carnet.hr/debian/ lenny main contrib non-free
+3 deb http://ftp.carnet.hr/carnet-debian/ lenny main non-free"
notneeded_repos_regexp="^deb.*tp://.*debian-non-US"
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://ftp.carnet.hr/debian lenny main contrib non-free
-deb http://security.debian.org lenny/updates main contrib non-free
+deb http://ftp.carnet.hr/debian/ lenny main contrib non-free
+deb http://security.debian.org/ lenny/updates main contrib non-free
# CARNet Debian Linux v3
-deb http://ftp.carnet.hr/carnet-debian carnet-lenny main non-free
+deb http://ftp.carnet.hr/carnet-debian/ carnet-lenny main non-free
# Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.carnet.hr/debian lenny main contrib non-free
-#deb-src http://security.debian.org lenny/updates main contrib non-free
+#deb-src http://ftp.carnet.hr/debian/ lenny main contrib non-free
+#deb-src http://security.debian.org/ lenny/updates main contrib non-free