debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Add '.0' to ABI name whenever upstream version has 2 components 

This is not just for 3.0 and 3.1.  We will remove this after wheezy
release, whichever version that is.

svn path=/dists/trunk/linux-2.6/; revision=18246
This commit is contained in:
Ben Hutchings 2011-11-12 04:05:20 +00:00
parent 9267200ee0
commit acd9830064
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/bin/gencontrol.py vendored
View File

@ -344,15 +344,13 @@ class Gencontrol(Base):
self.versions = versions
version = self.version = self.changelog[0].version
if self.version.linux_modifier is not None:
self.abiname = self.version.linux_upstream
self.abiname_part = ''
else:
self.abiname_part = '-%s' % self.config['abi',]['abiname']
# XXX: We need to add another part before Wheezy
if self.version.linux_upstream in ('3.0', '3.1'):
self.abiname = self.version.linux_upstream + '.0' + self.abiname_part
else:
self.abiname = self.version.linux_upstream + self.abiname_part
# XXX: We need to add another part until after wheezy
self.abiname = (re.sub('^(\d+\.\d+)(?=-|$)', r'\1.0',
self.version.linux_upstream)
+ self.abiname_part)
self.vars = {
'upstreamversion': self.version.linux_upstream,
'version': self.version.linux_version,