From: Gerfried Fuchs <rhonda@debian.at>
Date: Sat, 11 Sep 2010 15:53:09 +0000 (+0200)
Subject: Adjust for backports.org -> backports.debian.org
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=124a3f1f7d55089e3b369bf2495495db8b6e1d6a;p=deb%2Fpackages.git

Adjust for backports.org -> backports.debian.org
---

diff --git a/INSTALL b/INSTALL
index 3168c84..9a606a1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,15 +8,15 @@ This guide assumes you are working on a Debian etch system. If that is not the
 case, you might have to adjust some of the steps.
 
 1) Install git (package git-core). You will get a much more pleasant user
-   experience if you use a version from backports.org or a self-compiled one
+   experience if you use a version from backports.debian.org or a self-compiled one
    instead of etch's version.
 2) Download the code from git://source.djpig.de/git/packages.git
    (Something like `git clone git://source.djpig.de/git/packages.git')
 3) Install the needed dependencies. A list can be found in debian/control.
    One dependency can't be fulfilled directly from etch and is therefor not listed
    there: the Search::Xapian perl module. You can either compile that yourself against
-   libxapian from etch, use the backport on backports.org, or install the 0.9.9-1 deb
-   from snapshots.debian.net.
+   libxapian from etch, use the backport on backports.debian.org, or install the
+   0.9.9-1 deb from snapshot.debian.org.
 4) Install apache2 (apache2-mpm-worker) and mod_perl (libapache2-mod-perl2)
 5) Adjust the configuration to your needs. You should at least edit the following
    files before starting to test (don't touch %TOPDIR% and %SITE%, as you will 
diff --git a/README b/README
index 14d8bfb..7f3e443 100644
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ Cron
 010git                     -- pull changes from git
 050checkinst               -- check if all needed packages are installed
 100syncarchive             -- retrieve data from main Debian archive
-100syncarchive_backports   -- retrieve data from backports.org
+100syncarchive_backports   -- retrieve data from backports.debian.org
 100syncarchive_debports    -- retrieve data from debian-ports.org (m68k)
 100syncarchive_installer   -- retrieve d-i data
 100syncarchive_m68k        -- retrieve data for etch-m68k
diff --git a/config.sh.sed.in b/config.sh.sed.in
index 50170de..d3dde1f 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -27,7 +27,7 @@ cachedir=${topdir}/cache
 ftpsite=http://ftp.de.debian.org/debian
 security_ftpsite=http://security.debian.org/debian-security
 volatile_ftpsite=http://volatile.debian.org/debian-volatile
-backports_ftpsite=http://backports.org/debian
+backports_ftpsite=http://backports.debian.org/debian-backports
 debports_ftpsite=http://ftp.debian-ports.org/debian
 ddtp_ftpsite=
 
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 28c4a0e..5729d43 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -131,24 +131,22 @@ mirrors = {
 	},
 
 	backports => {
-		url => 'http://www.backports.org/',
+		url => 'http://backports.debian.org/',
 		title => g('newer packages that have been adapted to stable releases of Debian'),
 		mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
 		europa => [
-			"www.backports.org/debian",
-			"debian.sil.at/backports.org/",
-		    	"backports.debian.or.at/backports.org",
-		       	"mirror.realroute.net/backports.org",
+			"backports.debian.org/debian-backports",
+			"ftp.at.debian.org/debian-backports/",
+		    	"backports.debian.or.at/debian-backports",
+		       	"mirror.realroute.net/debian-backports",
 			"backports.cisbg.com",
-			"backports.linuxdediziert.de/backports.org",
 			"debian.netcologne.de/debian-backports",
-			"ftp.de.debian.org/backports.org",
-			"mirror.buildd.net/backports.org",
+			"ftp.de.debian.org/debian-backports",
+			"mirror.buildd.net/debian-backports",
 			"ftp.estpak.ee/backports.org",
 			"debian.acantho.net/backports.org",
 			"backports.essentkabel.com/backports.org",
 			"backports.sipo.nl",
-			"ftp.tuke.sk",
 		],
 		asia => [
 			"backports.mithril-linux.org",