[kernel] r18584 - in dists/sid/linux-latest/debian: . bin
Ben Hutchings
benh at alioth.debian.org
Thu Jan 19 04:02:01 UTC 2012
Author: benh
Date: Thu Jan 19 04:01:59 2012
New Revision: 18584
Log:
Update to 3.2.0-1
Sprinkle unicode liberally through gencontrol.py.
Modified:
dists/sid/linux-latest/debian/bin/gencontrol.py
dists/sid/linux-latest/debian/changelog
dists/sid/linux-latest/debian/rules.defs
Modified: dists/sid/linux-latest/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest/debian/bin/gencontrol.py Thu Jan 19 03:50:14 2012 (r18583)
+++ dists/sid/linux-latest/debian/bin/gencontrol.py Thu Jan 19 04:01:59 2012 (r18584)
@@ -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']
@@ -78,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 = []
@@ -90,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
@@ -100,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"]
@@ -125,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):
@@ -148,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/sid/linux-latest/debian/changelog
==============================================================================
--- dists/sid/linux-latest/debian/changelog Thu Jan 19 03:50:14 2012 (r18583)
+++ dists/sid/linux-latest/debian/changelog Thu Jan 19 04:01:59 2012 (r18584)
@@ -6,6 +6,7 @@
- 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> Tue, 06 Dec 2011 04:37:33 +0000
Modified: dists/sid/linux-latest/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest/debian/rules.defs Thu Jan 19 03:50:14 2012 (r18583)
+++ dists/sid/linux-latest/debian/rules.defs Thu Jan 19 04:01:59 2012 (r18584)
@@ -1,4 +1,4 @@
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
TEMPLATES_DIR = debian/templates
-KERNELVERSION := 3.1.0-1
+KERNELVERSION := 3.2.0-1
More information about the Kernel-svn-changes
mailing list