[kernel] r19483 - in dists/squeeze-backports/linux-latest: . debian debian/po debian/templates

[Ben Hutchings]

Author: benh
Date: Tue Nov  6 17:09:20 2012
New Revision: 19483

Log:
Merge changes from sid up to 46

Added:
   dists/squeeze-backports/linux-latest/debian/po/cs.po
      - copied unchanged from r19417, dists/sid/linux-latest/debian/po/cs.po
Modified:
   dists/squeeze-backports/linux-latest/   (props changed)
   dists/squeeze-backports/linux-latest/debian/   (props changed)
   dists/squeeze-backports/linux-latest/debian/changelog
   dists/squeeze-backports/linux-latest/debian/rules.defs
   dists/squeeze-backports/linux-latest/debian/templates/control.source.in

Modified: dists/squeeze-backports/linux-latest/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux-latest/debian/changelog	Tue Nov  6 04:48:05 2012	(r19482)
+++ dists/squeeze-backports/linux-latest/debian/changelog	Tue Nov  6 17:09:20 2012	(r19483)
@@ -1,9 +1,18 @@
-linux-latest (45~bpo60+1) squeeze-backports; urgency=low
+linux-latest (46~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze:
-    - ABI version is 0.bpo.3, not 3
+    - ABI version is 0.bpo.4, not 4
 
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 19 Aug 2012 22:07:02 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 06 Nov 2012 17:08:17 +0000
+
+linux-latest (46) unstable; urgency=low
+
+  * Set Priority: extra, as currently overridden in the archive
+    (Closes: #689846)
+  * Add Czech debconf template translation (Michal Šimůnek) (Closes: #685501)
+  * Update to 3.2.0-4 (Closes: #688222, #689864)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 07 Oct 2012 19:51:50 +0100
 
 linux-latest (45) unstable; urgency=low
 

Copied: dists/squeeze-backports/linux-latest/debian/po/cs.po (from r19417, dists/sid/linux-latest/debian/po/cs.po)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest/debian/po/cs.po	Tue Nov  6 17:09:20 2012	(r19483, copy of r19417, dists/sid/linux-latest/debian/po/cs.po)
@@ -0,0 +1,45 @@
+# Czech PO debconf template translation of linux-latest.
+# Copyright (C) 2012 Michal Simunek <michal.simunek at gmail.com>
+# This file is distributed under the same license as the linux-latest package.
+# Michal Simunek <michal.simunek at gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-latest-2.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-24 16:15+0200\n"
+"PO-Revision-Date: 2012-08-21 12:31+0200\n"
+"Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
+"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid "This system requires a different kernel configuration"
+msgstr "Tento systém vyžaduje jiné nastavení jádra"
+
+#. Type: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid ""
+"Debian's '686' kernel configuration has been replaced by the '686-pae' "
+"configuration, which uses PAE (Physical Address Extension).  However, the "
+"CPU in this system does not support PAE."
+msgstr ""
+"Nastavení jádra Debianu '686' bylo nahrazeno nastavením '686-pae', které "
+"používá PAE (Physical Address Extension - Rozšíření fyzické paměti). CPU "
+"v tomto systému však PAE nepodporuje."
+
+#. Type: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid ""
+"You should install linux-image-486 and remove linux-image-686 and/or linux-"
+"image-2.6-686 if they are currently installed."
+msgstr ""
+"Musíte nainstalovat balíček linux-image-486 a pokud je nyní nainstalován, "
+"tak odstranit balíček linux-image-686 a nebo linux-image-2.6-686."

Modified: dists/squeeze-backports/linux-latest/debian/rules.defs
==============================================================================
--- dists/squeeze-backports/linux-latest/debian/rules.defs	Tue Nov  6 04:48:05 2012	(r19482)
+++ dists/squeeze-backports/linux-latest/debian/rules.defs	Tue Nov  6 17:09:20 2012	(r19483)
@@ -1,4 +1,4 @@
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates
-KERNELVERSION := 3.2.0-0.bpo.3
+KERNELVERSION := 3.2.0-0.bpo.4

Modified: dists/squeeze-backports/linux-latest/debian/templates/control.source.in
==============================================================================
--- dists/squeeze-backports/linux-latest/debian/templates/control.source.in	Tue Nov  6 04:48:05 2012	(r19482)
+++ dists/squeeze-backports/linux-latest/debian/templates/control.source.in	Tue Nov  6 17:09:20 2012	(r19483)
@@ -1,6 +1,6 @@
 Source: linux-latest
 Section: kernel
-Priority: optional
+Priority: extra
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.3