[kernel] r18615 - in dists/squeeze-backports: linux-latest linux-latest-2.6 linux-latest/debian linux-latest/debian/bin linux-latest/debian/po linux-latest/debian/templates

Ben Hutchings benh at alioth.debian.org
Tue Jan 24 05:32:14 UTC 2012


Author: benh
Date: Tue Jan 24 05:32:12 2012
New Revision: 18615

Log:
Merge changes from sid up to 42

Added:
   dists/squeeze-backports/linux-latest/   (props changed)
      - copied from r18600, dists/squeeze-backports/linux-latest-2.6/
   dists/squeeze-backports/linux-latest/debian/po/ja.po
      - copied unchanged from r18587, dists/sid/linux-latest/debian/po/ja.po
   dists/squeeze-backports/linux-latest/debian/po/pt.po
      - copied, changed from r18391, dists/sid/linux-latest-2.6/debian/po/pt.po
   dists/squeeze-backports/linux-latest/debian/po/ru.po
      - copied unchanged from r18587, dists/sid/linux-latest/debian/po/ru.po
   dists/squeeze-backports/linux-latest/debian/po/sr at latin.po
      - copied unchanged from r18587, dists/sid/linux-latest/debian/po/sr at latin.po
Deleted:
   dists/squeeze-backports/linux-latest-2.6/
   dists/squeeze-backports/linux-latest/debian/templates/control.image.latest.type-modules.in
Modified:
   dists/squeeze-backports/linux-latest/debian/   (props changed)
   dists/squeeze-backports/linux-latest/debian/bin/gencontrol.py
   dists/squeeze-backports/linux-latest/debian/changelog
   dists/squeeze-backports/linux-latest/debian/po/ca.po
   dists/squeeze-backports/linux-latest/debian/po/de.po
   dists/squeeze-backports/linux-latest/debian/po/fr.po
   dists/squeeze-backports/linux-latest/debian/po/nl.po
   dists/squeeze-backports/linux-latest/debian/po/sr.po
   dists/squeeze-backports/linux-latest/debian/po/sv.po
   dists/squeeze-backports/linux-latest/debian/po/templates.pot
   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/bin/gencontrol.py
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/bin/gencontrol.py	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/bin/gencontrol.py	Tue Jan 24 05:32:12 2012	(r18615)
@@ -8,7 +8,7 @@
 from debian_linux.gencontrol import Gencontrol as Base
 from debian_linux.utils import Templates
 
-import os.path, re
+import os.path, re, codecs
 
 class Gencontrol(Base):
     def __init__(self, config):
@@ -25,14 +25,14 @@
         }
 
         changelog_version = Changelog()[0].version
-        self.package_version = '%s+%s' % (self.version.linux_version, changelog_version.complete)
+        self.package_version = u'%s+%s' % (self.version.linux_version, changelog_version.complete)
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
 
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages['source']['Build-Depends'].extend(
-            ['linux-support-%s' % self.abiname]
+            [u'linux-support-%s' % self.abiname]
         )
 
         latest_source = self.templates["control.source.latest"]
@@ -47,7 +47,7 @@
     def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         if self.version.linux_modifier is None:
             try:
-                vars['abiname'] = '-%s' % self.config['abi', arch]['abiname']
+                vars['abiname'] = u'-%s' % self.config['abi', arch]['abiname']
             except KeyError:
                 vars['abiname'] = self.abiname
             makeflags['ABINAME'] = vars['abiname']
@@ -62,10 +62,7 @@
 
         templates = []
 
-        if config_image.get('type', None) == 'plain-xen':
-            templates.extend(self.templates["control.image.latest.type-modules"])
-        else:
-            templates.extend(self.templates["control.image.latest.type-standalone"])
+        templates.extend(self.templates["control.image.latest.type-standalone"])
         if config_base.get('modules', True):
             templates.extend(self.templates["control.headers.latest"])
 
@@ -81,7 +78,7 @@
                 desc.append(config_description['part-long-' + part])
                 desc.append_short(config_description.get('part-short-' + part, ''))
 
-            if 'xen' in desc_parts:
+            if u'xen' in desc_parts:
                 templates.extend(self.templates["control.xen-linux-system.latest"])
 
         packages_dummy = []
@@ -93,9 +90,9 @@
             name = package['Package']
             if packages.has_key(name):
                 package = packages.get(name)
-                package['Architecture'].append(arch)
+                package['Architecture'].add(unicode(arch))
             else:
-                package['Architecture'] = [arch]
+                package['Architecture'] = unicode(arch)
                 packages.append(package)
 
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
@@ -103,14 +100,14 @@
         cmds_binary_arch = []
         for i in packages_dummy:
             cmds_binary_arch += self.get_link_commands(i, ['NEWS'])
-        cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags)]
+        cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (u' '.join([u"-p%s" % i['Package'] for i in packages_dummy]), makeflags)]
         makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_binary_arch)
 
         for i in packages_dummy:
-            if i['Package'].startswith('linux-image-'):
+            if i['Package'].startswith(u'linux-image-'):
                 bug_presubj = self.substitute(
                     self.templates["bug-presubj.image.latest"], vars)
-                file("debian/%s.bug-presubj" % i['Package'], 'w').write(bug_presubj)
+                codecs.open("debian/%s.bug-presubj" % i['Package'], 'w', 'utf-8').write(bug_presubj)
 
     def do_extra(self, packages, makefile):
         templates_extra = self.templates["control.extra"]
@@ -128,13 +125,13 @@
         for arch in archs:
             cmds = []
             for i in extra_arches[arch]:
-                if i.has_key('X-Version-Overwrite-Epoch'):
-                    version = '-v1:%s' % self.package_version
+                if i.has_key(u'X-Version-Overwrite-Epoch'):
+                    version = u'-v1:%s' % self.package_version
                 else:
-                    version = '-v%s' % self.package_version
+                    version = u'-v%s' % self.package_version
                 cmds += self.get_link_commands(i, ['config', 'postinst', 'templates'])
                 cmds.append("$(MAKE) -f debian/rules.real install-dummy ARCH='%s' DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch, i['Package'], version))
-            makefile.add('binary-arch_%s' % arch, ['binary-arch_%s_extra' % arch])
+            makefile.add('binary-arch_%s' % arch, [u'binary-arch_%s_extra' % arch])
             makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
 
     def process_real_image(self, entry, fields, vars):
@@ -151,7 +148,7 @@
     def get_link_commands(package, names):
         cmds = []
         for name in names:
-            match = re.match(r'^(linux-\w+)(-2.6)?(-.*)$', package['Package'])
+            match = re.match(ur'^(linux-\w+)(-2.6)?(-.*)$', package['Package'])
             if not match:
                 continue
             if match.group(2):

Modified: dists/squeeze-backports/linux-latest/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/changelog	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/changelog	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,9 +1,21 @@
-linux-latest-2.6 (41~bpo60+1) squeeze-backports; urgency=low
+linux-latest (42~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 17 Jan 2012 02:49:07 +0000
 
+linux-latest (42) unstable; urgency=low
+
+  * Rename source package to linux-latest
+  * Add debconf template translations:
+    - Portugese (Miguel Figueiredo) (Closes: #651123)
+    - Serbian latin (Zlatan Todoric) (Closes: #635895)
+    - Russian (Yuri Kozlov) (Closes: #652431)
+    - Japanese (Nobuhiro Iwamatsu) (Closes: #655687)
+  * Update to 3.2.0-1
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 19 Jan 2012 04:02:32 +0000
+
 linux-latest-2.6 (41) unstable; urgency=low
 
   * Remove dependency on module makefiles in linux-support package

Modified: dists/squeeze-backports/linux-latest/debian/po/ca.po
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/ca.po	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/ca.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# debconf templates for linux-latest-2.6; translation into Catalan.
+# debconf templates for linux-latest; translation into Catalan.
 # Copyright (C) 2011 Software in the Public Interest
-# This file is distributed under the same license as the linux-latest-2.6
+# This file is distributed under the same license as the linux-latest
 # package.
 # Innocent De Marchi <tangram.peces at gmail.com>, 2011
 #

Modified: dists/squeeze-backports/linux-latest/debian/po/de.po
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/de.po	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/de.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# debconf templates for linux-latest-2.6; translation into German.
+# debconf templates for linux-latest; translation into German.
 # Copyright Holger Wansing <linux at wansing-online.de>, 2011.
-# This file is distributed under the same license as the linux-latest-2.6
+# This file is distributed under the same license as the linux-latest
 # package.
 # Holger Wansing <linux at wansing-online.de>, 2011
 #

Modified: dists/squeeze-backports/linux-latest/debian/po/fr.po
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/fr.po	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/fr.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# Translation of linux-latest-2.6 debconf templates to French
+# Translation of linux-latest debconf templates to French
 # Copyright (C) 2011 Debian French l10n team <debian-l10n-french at lists.debian.org>
-# This file is distributed under the same license as the linux-latest-2.6 package.
+# This file is distributed under the same license as the linux-latest package.
 #
 # Translator:
 # Christian Perrier <bubulle at debian.org>, 2011.

Copied: dists/squeeze-backports/linux-latest/debian/po/ja.po (from r18587, dists/sid/linux-latest/debian/po/ja.po)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest/debian/po/ja.po	Tue Jan 24 05:32:12 2012	(r18615, copy of r18587, dists/sid/linux-latest/debian/po/ja.po)
@@ -0,0 +1,46 @@
+# debconf templates for linux-latest; translation into Japanese.
+# Copyright 2012 Nobuhiro Iwamatsu
+# This file is distributed under the same license as the linux-latest
+# package.
+# Nobuhiro Iwamatsu <iwamatsu at debian.org>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-latest 41\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-24 16:15+0200\n"
+"PO-Revision-Date: 2012-01-13 16:30+0900\n"
+"Last-Translator: Nobuhiro Iwamatsu <iwamatsu at debian.org>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"Language: ja\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 "システムには別のカーネルコンフィグレーションが必要です"
+
+#. 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 ""
+"Debian の「686」カーネルコンフィグレーションは PAE (物理アドレス拡張機能) を"
+"使用する「686-pae」コンフィグレーションに置き換えられました。"
+"しかしこのシステムの CPU は PAE をサポートしていません。"
+
+#. 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 ""
+"もしそれらが現在インストールされているなら、linux-image-486 をインストールし、"
+"linux-image-686 と linux-image-2.6-686 を削除する必要があります。"

Modified: dists/squeeze-backports/linux-latest/debian/po/nl.po
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/nl.po	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/nl.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# Dutch translation of linux-latest-2.6 debconf templates.
+# Dutch translation of linux-latest debconf templates.
 # Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the linux-latest-2.6 package.
+# This file is distributed under the same license as the linux-latest package.
 # Jeroen Schot <schot at a-eskwadraat.nl>, 2011.
 #
 msgid ""

Copied and modified: dists/squeeze-backports/linux-latest/debian/po/pt.po (from r18391, dists/sid/linux-latest-2.6/debian/po/pt.po)
==============================================================================
--- dists/sid/linux-latest-2.6/debian/po/pt.po	Fri Dec 16 03:36:57 2011	(r18391, copy source)
+++ dists/squeeze-backports/linux-latest/debian/po/pt.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# debconf templates for linux-latest-2.6; translation into Portuguese.
+# debconf templates for linux-latest; translation into Portuguese.
 # Copyright 2011 Miguel Figueiredo <elmig at debianpt.org>
-# This file is distributed under the same license as the linux-latest-2.6
+# This file is distributed under the same license as the linux-latest
 # package.
 # Miguel Figueiredo <elmig at debianpt.org>, 2011.
 #

Copied: dists/squeeze-backports/linux-latest/debian/po/ru.po (from r18587, dists/sid/linux-latest/debian/po/ru.po)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest/debian/po/ru.po	Tue Jan 24 05:32:12 2012	(r18615, copy of r18587, dists/sid/linux-latest/debian/po/ru.po)
@@ -0,0 +1,50 @@
+# debconf templates for linux-latest; translation into Russian.
+# Copyright 2011 Yuri Kozlov <yuray at komyakino.ru>
+# This file is distributed under the same license as the linux-latest
+# package.
+#
+# Yuri Kozlov <yuray at komyakino.ru>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-latest-2.6 41\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-24 16:15+0200\n"
+"PO-Revision-Date: 2011-12-17 09:42+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian at 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: 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: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid "This system requires a different kernel configuration"
+msgstr "Этой системе требуется другой пакет с ядром"
+
+#. 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 ""
+"Настройка ядра Debian «686» была заменена настройкой «686-pae», "
+"в которой используется PAE (расширение физических адресов). Однако, "
+"процессор данного компьютера не поддерживает PAE."
+
+#. 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 ""
+"Вы должны установить пакет linux-image-486 и удалить linux-image-686 и/или "
+"linux-image-2.6-686 (если они установлены)."
+

Modified: dists/squeeze-backports/linux-latest/debian/po/sr.po
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/sr.po	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/sr.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# debconf templates for linux-latest-2.6; translation into Serbian cyrillic.
+# debconf templates for linux-latest; translation into Serbian cyrillic.
 # Copyright 2011
-# This file is distributed under the same license as the linux-latest-2.6
+# This file is distributed under the same license as the linux-latest
 # package.
 # Zlatan Todoric <zlatan.todoric at gmail.com>, 2011.
 #

Copied: dists/squeeze-backports/linux-latest/debian/po/sr at latin.po (from r18587, dists/sid/linux-latest/debian/po/sr at latin.po)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest/debian/po/sr at latin.po	Tue Jan 24 05:32:12 2012	(r18615, copy of r18587, dists/sid/linux-latest/debian/po/sr at latin.po)
@@ -0,0 +1,45 @@
+# debconf templates for linux-latest; translation into Serbian latin.
+# Copyright 2011
+# This file is distributed under the same license as the linux-latest
+# package.
+# Zlatan Todoric <zlatan.todoric at gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-latest-2.6 VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-24 16:15+0200\n"
+"PO-Revision-Date: 2011-07-29 HO:MI+ZONE\n"
+"Last-Translator: Zlatan Todoric <zlatan.todoric at gmail.com>\n"
+"Language-Team: Soon to come\n"
+"Language: \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 "Ovaj sistem zahtijeva drugačiju konfiguraciju jezgra"
+
+#. 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 ""
+"Debian '686' konfiguracija jezgra zamijenjena sa '686-pae' konfiguracijom,"
+"koja koristi PAE (Physical Address Extension). Međutim, procesor u ovom"
+"sistemu ne podržava PAE."
+#. 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 ""
+"Trebali biste instalirati linux-image-486 i ukloniti linux-image-686 i/ili"
+"linux-image-2.6-686 ako su trenutno instalisani."

Modified: dists/squeeze-backports/linux-latest/debian/po/sv.po
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/sv.po	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/sv.po	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# Translation of linux-latest-2.6 debconf template to Swedish
+# Translation of linux-latest debconf template to Swedish
 # Copyright (C) 2011 Martin Bagge <brother at bsnet.se>
-# This file is distributed under the same license as the linux-latest-2.6 package.
+# This file is distributed under the same license as the linux-latest package.
 #
 # Martin Bagge <brother at bsnet.se>, 2011
 msgid ""

Modified: dists/squeeze-backports/linux-latest/debian/po/templates.pot
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/po/templates.pot	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/po/templates.pot	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,6 +1,6 @@
-# debconf templates for linux-latest-2.6; translation into LANGUAGE.
+# debconf templates for linux-latest; translation into LANGUAGE.
 # Copyright YEAR TRANSLATION COPYRIGHT HOLDER
-# This file is distributed under the same license as the linux-latest-2.6
+# This file is distributed under the same license as the linux-latest
 # package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #

Modified: dists/squeeze-backports/linux-latest/debian/rules.defs
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/rules.defs	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/rules.defs	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,4 +1,4 @@
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates
-KERNELVERSION := 3.1.0-0.bpo.1
+KERNELVERSION := 3.2.0-0.bpo.1

Modified: dists/squeeze-backports/linux-latest/debian/templates/control.source.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.in	Sun Jan 22 02:31:49 2012	(r18600)
+++ dists/squeeze-backports/linux-latest/debian/templates/control.source.in	Tue Jan 24 05:32:12 2012	(r18615)
@@ -1,4 +1,4 @@
-Source: linux-latest-2.6
+Source: linux-latest
 Section: kernel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>



More information about the Kernel-svn-changes mailing list