Merge some changes from squeeze/sid branch

linux-base: Remove dependency on libapt-pkg-perl (Closes: #589996) Update debconf template translations: - Czech (Michal Simunek) (Closes: #590546) - Portugese (Américo Monteiro) (Closes: #590557) - French (David Prévot) (Closes: #591149) - Russian (Yuri Kozlov) (Closes: #591241) - Swedish (Martin Bagge) (Closes: #592045) - German (Holger Wansing) (Closes: #592226) [x86] Enable samsung-laptop driver [sparc] Enable XVR1000 driver (Closes: #574243) README.Debian: Add references to kernel handbook and wiki [i386/{openvz,xen}-686] Remove AMD Geode LX and VIA C3 "Nehemiah" from the list of supported processors svn path=/dists/trunk/linux-2.6/; revision=16156
2010-08-18 02:29:07 +00:00 · 2010-08-18 02:29:07 +00:00 · 720ef1586d
parent d038da1846
commit 720ef1586d
16 changed files with 206 additions and 65 deletions
--- a/debian/README.Debian
+++ b/debian/README.Debian
@ -43,3 +43,8 @@ berkelydb (libdb4.2-dev) installed.
 Non-free bits removed
 ---------------------
 See the patches under debian/patches/debian/dfsg.
+
+Further information
+-------------------
+Debian Linux Kernel Handbook: http://kernel-handbook.alioth.debian.org
+Debian Wiki: http://wiki.debian.org/DebianKernel
--- a/debian/changelog
+++ b/debian/changelog
@ -2,6 +2,18 @@ linux-2.6 (2.6.35-1~experimental.3) UNRELEASED; urgency=low

  [ Ritesh Raj Sarraf ]
  * Add .gnu_debuglink information into kernel modules (Closes: #555549)
+  
+  [ Ben Hutchings ]
+  * linux-base: Remove dependency on libapt-pkg-perl (Closes: #589996)
+  * Update debconf template translations:
+    - Czech (Michal Simunek) (Closes: #590546)
+    - Portugese (Américo Monteiro) (Closes: #590557)
+    - French (David Prévot) (Closes: #591149)
+    - Russian (Yuri Kozlov) (Closes: #591241)
+    - Swedish (Martin Bagge) (Closes: #592045)
+    - German (Holger Wansing) (Closes: #592226)
+  * [x86] Enable samsung-laptop driver
+  * [sparc] Enable XVR1000 driver (Closes: #574243)

 -- Ben Hutchings <ben@decadent.org.uk>  Wed, 18 Aug 2010 02:45:21 +0100

--- a/debian/config/i386/openvz/defines
+++ b/debian/config/i386/openvz/defines
@ -8,3 +8,7 @@ configs:

 [686_image-dbg]
 enabled: true
+
+[686_description]
+hardware: modern PCs
+hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; or VIA C7 processors
--- a/debian/config/i386/xen/defines
+++ b/debian/config/i386/xen/defines
@ -16,3 +16,6 @@ configs:
 i386/none/config.686-bigmem
 recommends: libc6-xen

+[686_description]
+hardware: modern PCs
+hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD Geode NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; or VIA C7 processors
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@ -1148,6 +1148,11 @@ CONFIG_USB_IP_HOST=m
 ##
 CONFIG_PRISM2_USB=m

+##
+## file: drivers/staging/samsung-laptop/Kconfi
+##
+CONFIG_SAMSUNG_LAPTOP=m
+
 ##
 ## file: drivers/telephony/Kconfig
 ##
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@ -457,6 +457,7 @@ CONFIG_FB_FFB=y
 # CONFIG_FB_P9100 is not set
 # CONFIG_FB_LEO is not set
 CONFIG_FB_XVR500=y
+CONFIG_FB_XVR1000=y
 CONFIG_FB_XVR2500=y
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
--- a/debian/linux-base.postinst
+++ b/debian/linux-base.postinst
@ -18,7 +18,6 @@

 use strict;
 use warnings;
-use AptPkg::Config;
 use Debconf::Client::ConfModule ':all';
 use FileHandle;
 use POSIX ();
@ -1595,12 +1594,55 @@ retry:
    }
 }

+package DebianKernel::BootloaderConfig;
+
+my %default_bootloader = (amd64 => 'lilo',
+			  i386  => 'lilo',
+			  ia64  => 'elilo',
+			  s390  => 'zipl');
+
+sub check {
+    use Debconf::Client::ConfModule ':all';
+
+    my ($deb_arch) = @_;
+
+    # Is there an historical 'default' boot loader for this architecture?
+    my $loader_exec = $default_bootloader{$deb_arch};
+    return unless defined($loader_exec);
+
+    # Is the boot loader installed?
+    my ($loaderloc) = grep(-x, map("$_/$loader_exec",
+				   map({ length($_) ? $_ : "." }
+				       split(/:/, $ENV{PATH}))));
+    return unless defined($loaderloc);
+
+    # Is do_bootloader explicitly set one way or the other?
+    my $do_bootloader;
+    if (my $conf = new FileHandle('/etc/kernel-img.conf', 'r')) {
+	while (<$conf>) {
+	    $do_bootloader = 0 if /do_bootloader\s*=\s*(no|false|0)\s*$/i;
+	    $do_bootloader = 1 if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+	}
+	$conf->close();
+    }
+    return if defined($do_bootloader);
+
+    # Warn the user that do_bootloader is disabled by default.
+    my ($question, $ret, $seen);
+    $question = "linux-base/do-bootloader-default-changed";
+    ($ret,$seen) = input('high', "$question");
+    die "Error setting debconf question $question: $seen" if $ret && $ret != 30;
+    ($ret,$seen) = go();
+    die "Error asking debconf question $question: $seen" if $ret && $ret != 30;
+}
+
 package main;

 capb('escape');

-sub compare_versions {
-    return $AptPkg::Config::_config->system->versioning->compare(@_);
+sub version_lessthan {
+    my ($left, $right) = @_;
+    return system('dpkg', '--compare-versions', $left, 'lt', $right) == 0;
 }

 # No upgrade work is necessary during a fresh system installation.
@ -1627,11 +1669,15 @@ if ($deb_arch ne 's390') {
 	($deb_arch eq 'i386' || $deb_arch eq 'amd64') ? '2.6.32-10' : '2.6.32-11';
    if ($ARGV[0] eq 'reconfigure' || defined($ENV{DEBCONF_RECONFIGURE}) ||
 	(!is_fresh_installation() &&
-	 compare_versions($ARGV[1], $libata_transition_ver) < 0)) {
+	 version_lessthan($ARGV[1], $libata_transition_ver))) {
 	DebianKernel::DiskId::transition();
    }
 }

+if (!is_fresh_installation() && version_lessthan($ARGV[1], '2.6.32-18')) {
+    DebianKernel::BootloaderConfig::check($deb_arch);
+}
+
 exec("set -e\nset -- @ARGV\n" . << 'EOF');
 #DEBHELPER#
 EOF
--- a/debian/linux-base.templates
+++ b/debian/linux-base.templates
@ -85,3 +85,14 @@ Description: Failed to update disk device IDs
 .
 You can either correct this error and retry the automatic update,
 or choose to update the system configuration yourself.
+
+Template: linux-base/do-bootloader-default-changed
+Type: error
+_Description: Boot loader may need to be upgraded
+ Kernel packages no longer update a default boot loader.
+ .
+ If the boot loader needs to be updated whenever a new kernel is
+ installed, the boot loader package should install a script in
+ /etc/kernel/postinst.d.  Alternately, you can specify the command
+ to update the boot loader by setting the 'postinst_hook' variable
+ in /etc/kernel-img.conf.
--- a/debian/patches/bugfix/all/stable/gen-patch
+++ b/debian/patches/bugfix/all/stable/gen-patch
@ -1,6 +1,9 @@
 #!/usr/bin/env python

 import os.path, re, sys, textwrap
+sys.path.append('debian/lib/python')
+from debian_linux.config import ConfigCoreHierarchy
+from debian_linux.debian import Changelog

 class Version(object):
    _rules = ur"^(\d+\.\d+\.\d+)\.(\d+)$"
@ -16,6 +19,8 @@ class Version(object):

 class GenPatch(object):
    def __init__(self, path, repo, version):
+        self.config = ConfigCoreHierarchy(['debian/config'])
+        self.package_version = Changelog()[0].version
        self.path = path
        self.repo = repo
        self.version = version
@ -33,11 +38,24 @@ class GenPatch(object):
        tag_out = "v%s" % self.version.complete
        print tag_in, tag_out

-        f = os.popen("cd %s; git diff %s %s | filterdiff -p 1 -x Makefile > %s" % (self.repo, tag_in, tag_out, os.path.join(self.path, patch)))
+        backports = self.config[('backports',)]
+        diff_filter = '-x Makefile'
+        if self.version.release == self.package_version.upstream:
+            diff_filter += ' ' + ' '.join("-x '%s'" % re.sub(r'/$', r'/*', path)
+                                          for path in backports)
+            git_paths = ''
+        else:
+            git_paths = ' '.join("'%s'" % path for path in backports
+                                 if backports[path] == self.version.release)
+
+        f = os.popen("cd %s; git diff %s %s -- %s | filterdiff -p 1 %s > %s" %
+                     (self.repo, tag_in, tag_out, git_paths, diff_filter,
+                      os.path.join(self.path, patch)))
        if f.close() is not None:
            raise RuntimeError

-        f = os.popen("cd %s; git log --oneline --reverse %s..%s^" % (self.repo, tag_in, tag_out))
+        f = os.popen("cd %s; git log --oneline --reverse %s..%s^ -- %s" %
+                     (self.repo, tag_in, tag_out, git_paths))
        out = file(os.path.join(self.path, log), 'w')
        out.write("  * Add stable release %s:\n" % self.version.complete)
        for line in f:
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6\n"
+"Project-Id-Version: linux-2.6 2.6.32-18\n"
 "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-05-12 18:02+0200\n"
+"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"PO-Revision-Date: 2010-07-26 18:02+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "Language: cs\n"
@ -55,7 +55,7 @@ msgid ""
 "become unbootable."
 msgstr ""
 "Pokud se rozhodnete, že nechcete aktualizovat nastavení systému automaticky, "
-"musíte před příštím restartem systému aktualizovat ID zařízení ručně, jinak "
+"musíte před příštím restartem systému ručně aktualizovat ID zařízení, jinak "
 "se systém může stát nezaveditelným."

 #. Type: boolean
@ -144,13 +144,13 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:8001
 msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Zavaděč může být nutné aktualizovat"

 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Jaderný balíček již neaktualizuje výchozí zavaděč."

 #. Type: error
 #. Description
@ -161,6 +161,10 @@ msgid ""
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
+"Pokud je nutné aktualizovat zavaděč kdykoli je nainstalováno nové jádro, "
+"balíček zavaděče nainstalovuje skript v /etc/kernel/postinst.d. "
+"Můžete také zadat příkaz k aktualizaci zavaděče nastavením proměnné "
+"'postinst_hook' v /etc/kernel-img.conf."

 #. Type: boolean
 #. Description
@ -271,10 +275,8 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
 msgid "Boot loader configuration must be updated"
-msgstr "Je vyžadováno ověření nastavení zavaděče"
+msgstr "Nastavení zavaděče musí být aktualizováno"

 #. Type: error
 #. Description
@ -283,3 +285,5 @@ msgid ""
 "Kernel packages no longer update a default boot loader.  You should remove "
 "'do_bootloader = yes' from /etc/kernel-img.conf."
 msgstr ""
+"Jaderný balíček již neaktualizuje výchozí zavaděč. Odstraňte "
+"'do_bootloader = yes' z /etc/kernel-img.conf."
--- a/debian/po/de.po
+++ b/debian/po/de.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
 "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-06-18 05:27+0100\n"
+"POT-Creation-Date: 2010-08-07 10:32+0200\n"
+"PO-Revision-Date: 2010-08-08 14:22+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@ -149,13 +149,14 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:8001
 msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Bootloader muss unter Umständen aktualisiert werden"

 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Kernel-Pakete werden nicht mehr länger den Standard-Bootloader "
+"aktualisieren."

 #. Type: error
 #. Description
@ -166,6 +167,11 @@ msgid ""
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
+"Falls der Bootloader aktualisiert werden muss, wenn ein neuer Kernel "
+"installiert wird, sollte das Bootloader-Paket ein Skript in "
+"/etc/kernel/postinst.d installieren. Alternativ können Sie den Befehl für "
+"die Aktualisierung des Bootloaders über das Setzen der Variable "
+"»postinst_hook« in /etc/kernel-img.conf festlegen."

 #. Type: boolean
 #. Description
@ -283,10 +289,8 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
 msgid "Boot loader configuration must be updated"
-msgstr "Überprüfung der Bootloader-Konfiguration erforderlich"
+msgstr "Aktualisierung der Bootloader-Konfiguration erforderlich"

 #. Type: error
 #. Description
@ -295,3 +299,6 @@ msgid ""
 "Kernel packages no longer update a default boot loader.  You should remove "
 "'do_bootloader = yes' from /etc/kernel-img.conf."
 msgstr ""
+"Kernel-Pakete aktualisieren nicht mehr länger den Standard-Bootloader. "
+"Sie sollten den Eintrag »do_bootloader = yes« aus /etc/kernel-img.conf "
+"entfernen."
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6 2.6.32-11\n"
 "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-04-30 05:35-0400\n"
+"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"PO-Revision-Date: 2010-07-26 12:24-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@ -158,13 +158,15 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:8001
 msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Le programme d'amorçage peut nécessiter une mise à niveau"

 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
+"Les paquets du noyau ne s'occupent plus de la mise à jour d'un programme "
+"d'amorçage par défaut."

 #. Type: error
 #. Description
@ -175,6 +177,11 @@ msgid ""
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
+"Si le programme d'amorçage doit être mis à jour à chaque fois qu'un nouveau "
+"noyau est installé, le paquet du programme d'amorçage doit installer un script "
+"dans /etc/kernel/postinst.d. Sinon, vous pouvez indiquer la commande de mise à "
+"jour du programme d'amorçage en configurant la variable « postinst_hook » dans "
+"/etc/kernel-img.conf."

 #. Type: boolean
 #. Description
@ -291,10 +298,9 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-#, fuzzy
 #| msgid "Boot loader configuration check needed"
 msgid "Boot loader configuration must be updated"
-msgstr "Vérification indispensable de la configuration du programme d'amorçage"
+msgstr "Mise à jour indispensable de la configuration du programme d'amorçage"

 #. Type: error
 #. Description
@ -303,3 +309,6 @@ msgid ""
 "Kernel packages no longer update a default boot loader.  You should remove "
 "'do_bootloader = yes' from /etc/kernel-img.conf."
 msgstr ""
+"Les paquets du noyau ne s'occupent plus de la mise à jour d'un programme "
+"d'amorçage par défaut. Vous devriez enlever 'do_bootloader = yes' de "
+"/etc/kernel-img.conf."
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@ -5,10 +5,10 @@
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 2.6.32-11\n"
+"Project-Id-Version: linux-2.6 2.6.32-18\n"
 "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-04-23 22:12+0100\n"
+"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"PO-Revision-Date: 2010-07-27 10:33+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@ -107,7 +107,7 @@ msgid ""
 "change when using the new kernel:"
 msgstr ""
 "Os seguintes ficheiros de configuração ainda usam alguns nomes de "
-"dispositivos que podem alterar quando usar o novo kernel:"
+"dispositivos que podem ser alterados quando usar o novo kernel:"

 #. Type: error
 #. Description
@ -151,13 +151,14 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:8001
 msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "O gestor de arranque pode precisar de ser actualizado"

 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
 msgid "Kernel packages no longer update a default boot loader."
 msgstr ""
+"Os pacotes do kernel já não actualizam um gestor de arranque predefinido."

 #. Type: error
 #. Description
@ -168,6 +169,11 @@ msgid ""
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
+"Se o gestor de arranque precisa de ser actualizado sempre que um novo kernel "
+"é instalado, o pacote do gestor de arranque deve instalar um script em "
+"/etc/kernel/postinst.d. Em alternativa, você pode especificar o comando para "
+"actualizar o gestor de arranque ao definir a variável 'postinst_hook' em "
+"/etc/kernel-img.conf."

 #. Type: boolean
 #. Description
@ -282,10 +288,8 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
 msgid "Boot loader configuration must be updated"
-msgstr "Necessária verificação da configuração do gestor de arranque"
+msgstr "A configuração do gestor de arranque tem de ser actualizada"

 #. Type: error
 #. Description
@ -294,3 +298,5 @@ msgid ""
 "Kernel packages no longer update a default boot loader.  You should remove "
 "'do_bootloader = yes' from /etc/kernel-img.conf."
 msgstr ""
+"Os pacotes do kernel já não actualizam um gestor de arranque predefinido. "
+"Você deve remover 'do_bootloader = yes' de /etc/kernel-img.conf."
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@ -1,29 +1,29 @@
 # translation of ru.po to Russian
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the linux-2.6 package.
 #
 # Yuri Kozlov <yuray@komyakino.ru>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: linux-2.6 new\n"
+"Project-Id-Version: linux-2.6 2.6.32-18\n"
 "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-04-24 10:31+0400\n"
+"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"PO-Revision-Date: 2010-08-01 17:11+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: ru\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 #. Type: boolean
 #. Description
 #: ../linux-base.templates:2001
 msgid "Update disk device IDs in system configuration?"
-msgstr "Обновить ID дисковых устройств в настройках системы?"
+msgstr "Обновить идентификаторы дисковых устройств в настройках системы?"

 #. Type: boolean
 #. Description
@ -58,7 +58,8 @@ msgid ""
 "become unbootable."
 msgstr ""
 "Если вы не выберете автоматическое обновление системных настроек, то должны "
-"обновить ID устройств самостоятельно до следующей перезагрузки, иначе "
+"обновить идентификаторы устройств самостоятельно до следующей перезагрузки, "
+"иначе "
 "система не запустится."

 #. Type: boolean
@ -67,7 +68,7 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:3001 ../linux-base.templates:4001
 msgid "Apply configuration changes to disk device IDs?"
-msgstr "Применить изменение настроек для ID дисковых устройств?"
+msgstr "Применить изменение настроек для идентификаторов дисковых устройств?"

 #. Type: boolean
 #. Description
@ -89,7 +90,7 @@ msgstr "Следующие файлы настройки будут обновл
 #. Description
 #: ../linux-base.templates:3001 ../linux-base.templates:4001
 msgid "The device IDs will be changed as follows:"
-msgstr "ID устройств будут изменены следующим образом:"
+msgstr "Идентификаторы устройств будут изменены следующим образом:"

 #. Type: error
 #. Description
@ -148,13 +149,13 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:8001
 msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Может потребоваться обновление системного загрузчика"

 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Пакеты ядра больше не обновляют системный загрузчик по умолчанию"

 #. Type: error
 #. Description
@ -165,6 +166,11 @@ msgid ""
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
+"Если системный загрузчик требует обновления после установки нового ядра, "
+"то пакет системного загрузчика должен устанавливать сценарий в каталог "
+"/etc/kernel/postinst.d. Или же вы можете задать команду обновления "
+"системного загрузчика, указав её в переменной postinst_hook в файле "
+"/etc/kernel-img.conf."

 #. Type: boolean
 #. Description
@ -276,10 +282,9 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-#, fuzzy
 #| msgid "Boot loader configuration check needed"
 msgid "Boot loader configuration must be updated"
-msgstr "Требуется проверка настроек системного загрузчика"
+msgstr "Требуется обновление настроек системного загрузчика"

 #. Type: error
 #. Description
@ -288,3 +293,6 @@ msgid ""
 "Kernel packages no longer update a default boot loader.  You should remove "
 "'do_bootloader = yes' from /etc/kernel-img.conf."
 msgstr ""
+"Пакеты ядра больше не обновляют системный загрузчик по умолчанию. "
+"Вы должны удалить строку \"do_bootloader = yes\" из файла "
+"/etc/kernel-img.conf."
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@ -7,14 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: linux-2.6\n"
 "Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-04-26 23:37+0100\n"
-"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"POT-Creation-Date: 2010-07-25 10:32+0200\n"
+"PO-Revision-Date: 2010-08-07 05:01+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"

 #. Type: boolean
 #. Description
@ -145,13 +147,13 @@ msgstr ""
 #. Description
 #: ../linux-base.templates:8001
 msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Uppstartshanteraren kan behöva uppgraderas"

 #. Type: error
 #. Description
 #: ../linux-base.templates:8001
 msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Kärnpaket uppdaterar inte längre uppstartshanterare."

 #. Type: error
 #. Description
@ -162,6 +164,11 @@ msgid ""
 "Alternately, you can specify the command to update the boot loader by "
 "setting the 'postinst_hook' variable in /etc/kernel-img.conf."
 msgstr ""
+"Om uppstartshanteraren behöver uppdateras när en ny kärna installeras ska "
+"uppstartshanteraren installera ett skript i /etc/kernel/postinst.d. "
+"Alternativt kan du ange kommandot som används för att uppdatera "
+"uppstartshanteraren genom att sätta variabeln \"postinst_hook\" i /etc/"
+"kernel-img.conf."

 #. Type: boolean
 #. Description
@ -275,10 +282,9 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../templates/temp.image.plain/templates:5001
-#, fuzzy
 #| msgid "Boot loader configuration check needed"
 msgid "Boot loader configuration must be updated"
-msgstr "Kontroll av konfigurationen i uppstartshanteraren behövs"
+msgstr "Inställningarna för uppstartshanteraren behöver uppdateras"

 #. Type: error
 #. Description
@ -287,3 +293,5 @@ msgid ""
 "Kernel packages no longer update a default boot loader.  You should remove "
 "'do_bootloader = yes' from /etc/kernel-img.conf."
 msgstr ""
+"Kärnpaket uppdaterar inte längre uppstartshanterare. Du ska ta bort "
+"\"do_bootloader = yes\" från /etc/kernel-img.conf."
--- a/debian/rules.real
+++ b/debian/rules.real
@ -407,18 +407,12 @@ install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates \
 install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates \
 install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux

-install-image_ia64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = elilo
-install-image_mips_$(FEATURESET)_r4k-ip22_plain_templates: ARG_BOOTLOADER = arcboot
-install-image_mips_$(FEATURESET)_r5k-ip32_plain_templates: ARG_BOOTLOADER = arcboot
-install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
-
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
 	for i in $(wildcard debian/templates/temp.image.plain/*); do \
 	  sed \
 	    -e 's@=B@$(KERNEL_ARCH)@g' \
 	    -e 's/=I/$(ARG_INITRD)/g' \
 	    -e 's/=K/$(ARG_KIMAGE)/g' \
-	    -e 's/=L/$(ARG_BOOTLOADER)/g' \
 	    -e 's@=MK@$(INITRD_CMD)@g' \
 	    -e 's/=V/$(REAL_VERSION)/g' \
 	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i) || exit; \