kfreebsd moves to main archive

While on it, reflect the fact that m68k is from debports in some
places where this was missing.

diff --git a/README b/README
index 944fc32aba7d6d2044848752f8ebfc018efbb6e7..14d8bfb4a672510218d7ffb33d8748f8ece3f846 100644 (file)
--- a/README
+++ b/README
@@ -44,8 +44,7 @@ Cron
 050checkinst               -- check if all needed packages are installed
 100syncarchive             -- retrieve data from main Debian archive
 100syncarchive_backports   -- retrieve data from backports.org
-100syncarchive_debports    -- retrieve data from debian-ports.org
-                              (kfreebsd-*, armel)
+100syncarchive_debports    -- retrieve data from debian-ports.org (m68k)
 100syncarchive_installer   -- retrieve d-i data
 100syncarchive_m68k        -- retrieve data for etch-m68k
 100syncarchive_maintainers -- retrieve maintainer index

diff --git a/bin/parse-contents b/bin/parse-contents
index 82df0b87b74341795df60a232670cd17ded0b9fc..a72bb71aefac3e96a904993764e3065062f4b7c1 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -142,7 +142,7 @@ for my $suite (@suites) {
 
            activate($filelist_db);
            #FIXME: hardcoded archs. (debports has no contrib/non-free)
-           if ($arch !~ m/^kfreebsd-.*$/) {
+           if ($arch ne 'm68k') {
                system("ln", "-sf", basename($filelist_db),
                       "$DBDIR/filelists_${suite}_all.db") == 0
                           or die "Oops";

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 02750b05b99162690c582a7905d1a13cfd484276..d8b9f79bc28b8248fd63b67c1c2af7d6068bd5e1 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -21,8 +21,6 @@ then
        foo=\$arch_${dist//-/_}
        for arch in `eval echo $foo`
        do
-           test ! "$arch" = "kfreebsd-i386" || continue
-           test ! "$arch" = "kfreebsd-amd64" || continue
            for part in ${parts}
            do
                echo retrieve Packages $dist/$part/$arch
@@ -57,8 +55,6 @@ else
        foo=\$arch_${dist//-/_}
        for arch in `eval echo $foo`
        do
-           test ! "$arch" = "kfreebsd-i386" || continue
-           test ! "$arch" = "kfreebsd-amd64" || continue
            for part in ${parts}
            do
                echo retrieve Packages $dist/$part/$arch

diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index c16f4c93ab29d932ccbf8e8188f98ec0a6d8bdf3..16dae2207b75739275fbec46bba306d8be98beb7 100755 (executable)
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="kfreebsd-i386 kfreebsd-amd64 m68k"
+architectures="m68k"
 
 for dist in sid experimental
   do

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index a30d8111c225f0bfd1c32caadfd981c06aaf0e45..f68562c33dfa480ff02162b2cea5e5c8baaa3666 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -138,16 +138,12 @@ mirrors = {
        },
 
        debports => {
-               title => g('ports of packages to architectures not yet available in Debian'),
+               title => g('ports of packages to architectures not yet or not anymore available in Debian'),
                mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
                unofficial_port => {
-                       'kfreebsd-amd64' => {
-                               url_name => 'kfreebsd-gnu',
-                               name => 'GNU/kFreeBSD',
-                       },
-                       'kfreebsd-i386' => {
-                               url_name => 'kfreebsd-gnu',
-                               name => 'GNU/kFreeBSD',
+                       m68k => {
+                               url_name => 'm68k',
+                               name => 'M68K',
                        },
                },
                north_america => [

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 97ef81e054d9d9ecb77499d944facfddbde14e5e..01dd76a654fc007aac2e93b5e2143668fd53f847 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -94,7 +94,7 @@ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section
 [% IF port.url_name;
    SET port.url = ports_url _ port.url_name _ '/';
    END -%]
-<p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
+<p style="clear:both">[% g('Note that %s is not officially included in the %s archive, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
        port.name, organisation, port.name, port.url, port.name) %]</p>
 [% END %]