apt: Update sunsite.dk and jones.dk locations and remove jones.dk kernels except potato ones.

11 files changed, 21 insertions, 67 deletions

diff --git a/apt/sources.list.da.firewall b/apt/sources.list.da.firewall
index 1285bbd..87731ad 100644
--- a/apt/sources.list.da.firewall
+++ b/apt/sources.list.da.firewall
@@ -1,5 +1,5 @@
-deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
+deb http://ftp.sunsite.dk&mirrors/debian potato main contrib non-free
+deb http://ftp.sunsite.dk/mirrors/debian-non-US potato/non-US main contrib non-free
 deb http://security.debian.org/ potato/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local/ potato misc firewall
+deb http://debian.jones.dk/ potato misc firewall
diff --git a/apt/sources.list.da.progeny-firewall b/apt/sources.list.da.progeny-firewall
deleted file mode 100644
index 83bf7ba..0000000
--- a/apt/sources.list.da.progeny-firewall
+++ /dev/null
@@ -1,18 +0,0 @@
-# Debian Potato
-#deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-#deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
-#deb http://security.debian.org/ potato/updates main contrib non-free
-deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free non-US/main non-US/contrib non-US/non-free
-deb http://sunsite.dk/ftp/pub/os/linux/debian-security potato/updates main contrib non-free
-
-# Progeny Debian
-#deb http://archive.progeny.com progeny main contrib non-free
-#deb http://archive.progeny.com progeny/progeny-updates/
-deb http://archive.progeny.com/progeny progeny main contrib non-free
-#deb http://archive.progeny.com/progeny dists/updates-progeny/
-deb http://archive.progeny.com/progeny progeny-updates/
-
-# Dr. Jones
-#deb http://debian.jones.dk/debian/local/ potato misc frewall private/misc
-#deb http://debian.jones.dk/debian/local/ progeny misc firewall private/misc
-deb http://debian.jones.dk/debian/local/ progeny misc firewall
diff --git a/apt/sources.list.da.progeny-server b/apt/sources.list.da.progeny-server
deleted file mode 100644
index 6e5ede6..0000000
--- a/apt/sources.list.da.progeny-server
+++ /dev/null
@@ -1,18 +0,0 @@
-# Debian Potato
-#deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-#deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
-#deb http://security.debian.org/ potato/updates main contrib non-free
-deb http://ftp.sunsite.dk/pub/os/linux/debian potato main contrib non-free non-US/main non-US/contrib non-US/non-free
-deb http://ftp.sunsite.dk/pub/os/linux/debian-security potato/updates main contrib non-free
-
-# Progeny Debian
-#deb http://archive.progeny.com progeny main contrib non-free
-#deb http://archive.progeny.com progeny/progeny-updates/
-deb http://archive.progeny.com/progeny progeny main contrib non-free
-#deb http://archive.progeny.com/progeny dists/updates-progeny/
-deb http://archive.progeny.com/progeny updates/stable/
-
-# Dr. Jones
-#deb http://debian.jones.dk/debian/local/ potato misc server private/misc
-#deb http://debian.jones.dk/debian/local/ progeny misc server private/misc
-deb http://debian.jones.dk/debian/local/ progeny misc server
diff --git a/apt/sources.list.da.server b/apt/sources.list.da.server
index fa02930..3a60fbd 100644
--- a/apt/sources.list.da.server
+++ b/apt/sources.list.da.server
@@ -1,6 +1,5 @@
-#deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-#deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
-deb http://ftp.sunsite.dk/pub/os/linux/debian potato main contrib non-free
+deb http://ftp.sunsite.dk&mirrors/debian potato main contrib non-free
+deb http://ftp.sunsite.dk/mirrors/debian-non-US potato/non-US main contrib non-free
 deb http://security.debian.org/ potato/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local potato misc server
+deb http://debian.jones.dk potato misc server
diff --git a/apt/sources.list.da.serverrouter b/apt/sources.list.da.serverrouter
index 84ecdfe..7022979 100644
--- a/apt/sources.list.da.serverrouter
+++ b/apt/sources.list.da.serverrouter
@@ -1,7 +1,5 @@
-#deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-#deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
-deb http://ftp.sunsite.dk/pub/os/linux/debian potato main contrib non-free
-deb http://security.debian.org/ potato/updates main contrib non-free
+deb http://ftp.sunsite.dk&mirrors/debian potato main contrib non-free
+deb http://ftp.sunsite.dk/mirrors/debian-non-US potato/non-US main contrib non-free
 deb http://security.debian.org/ potato/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local/ potato misc serverrouter
+deb http://debian.jones.dk/ potato misc serverrouter
diff --git a/apt/sources.list.da.woody-server b/apt/sources.list.da.woody-server
index 6930890..08ae1d4 100644
--- a/apt/sources.list.da.woody-server
+++ b/apt/sources.list.da.woody-server
@@ -1,7 +1,5 @@
-#deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-#deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
-#deb http://security.debian.org/ potato/updates main contrib non-free
-deb http://ftp.sunsite.dk/pub/os/linux/debian woody main contrib non-free non-US/main non-US/contrib non-US/non-free
-#deb http://sunsite.dk/ftp/pub/os/linux/debian-security potato/updates main contrib non-free
+deb http://ftp.sunsite.dk&mirrors/debian woody main contrib non-free
+deb http://ftp.sunsite.dk/mirrors/debian-non-US woody/non-US main contrib non-free
+deb http://security.debian.org/ potato/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local woody misc server
+deb http://debian.jones.dk/ woody misc
diff --git a/apt/sources.list.da.workstation b/apt/sources.list.da.workstation
index 2463403..b94cdcf 100644
--- a/apt/sources.list.da.workstation
+++ b/apt/sources.list.da.workstation
@@ -1,7 +1,5 @@
-deb http://sunsite.dk/ftp/pub/os/linux/debian potato main contrib non-free
-deb http://sunsite.dk/ftp/pub/os/linux/debian/non-US potato/non-US main contrib non-free
+deb http://ftp.sunsite.dk&mirrors/debian potato main contrib non-free
+deb http://ftp.sunsite.dk/mirrors/debian-non-US potato/non-US main contrib non-free
 deb http://security.debian.org/ potato/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local/ potato misc workstation
-
-deb http://spidermonkey.helixcode.com/distributions/debian unstable main
+deb http://debian.jones.dk/ potato misc workstation
diff --git a/apt/sources.list.us.serverrouter b/apt/sources.list.us.serverrouter
index 1cfcb11..44a4a53 100644
--- a/apt/sources.list.us.serverrouter
+++ b/apt/sources.list.us.serverrouter
@@ -2,4 +2,4 @@ deb http://http.us.debian.org/debian potato main contrib non-free
 deb http://non-us.debian.org/debian-non-US potato/non-US main contrib non-free
 deb http://security.debian.org/ potato/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local/ potato misc serverrouter
+deb http://debian.jones.dk/ potato misc serverrouter
diff --git a/apt/sources.list.us.sid-mpserver b/apt/sources.list.us.sid-mpserver
index 1846003..4150bbe 100644
--- a/apt/sources.list.us.sid-mpserver
+++ b/apt/sources.list.us.sid-mpserver
@@ -16,10 +16,7 @@ deb-src http://non-us.debian.org/debian-non-US sid/non-US main contrib non-free
 #deb-src http://spidermonkey.helixcode.com/distributions/Debian woody main
 
 # Dr. Jones
-#deb http://debian.jones.dk/pub/debian/local/ woody misc mpserver private/misc
-#deb http://debian.jones.dk/pub/debian/local/ sid misc mpserver private/misc
-deb http://debian.jones.dk/pub/debian/local/ sid misc mpserver
-#deb-src http://debian.jones.dk/pub/debian/local/ woody misc
+deb http://debian.jones.dk/pub/ sid misc
 
 # Pingoo
 #deb ftp://ftp.pingoo.org/debian stable main contrib pingoo-cs pingoo-cluster pingoo-laptop
diff --git a/apt/sources.list.us.woody+sid b/apt/sources.list.us.woody+sid
index cb4941a..256f0e7 100644
--- a/apt/sources.list.us.woody+sid
+++ b/apt/sources.list.us.woody+sid
@@ -4,4 +4,4 @@ deb http://ftp.us.debian.org/debian sid main contrib non-free
 deb http://non-us.debian.org/debian-non-US sid/non-US main contrib non-free
 deb http://security.debian.org/ stable/updates main contrib non-free
 
-deb http://debian.jones.dk/debian/local/ woody misc
+deb http://debian.jones.dk/ woody misc
diff --git a/apt/sources.list.us.woody-serverrouter b/apt/sources.list.us.woody-serverrouter
index 8a25ee9..83bfd39 100644
--- a/apt/sources.list.us.woody-serverrouter
+++ b/apt/sources.list.us.woody-serverrouter
@@ -1,5 +1,5 @@
 deb http://ftp.us.debian.org/debian woody main contrib non-free
 deb http://non-us.debian.org/debian-non-US woody/non-US main contrib non-free
-#deb http://security.debian.org/ woody/updates main contrib non-free
+deb http://security.debian.org/ potato/updates main contrib non-free
 
-#deb http://debian.jones.dk/debian/local/ woody misc serverrouter
+deb http://debian.jones.dk/debian/ woody misc