=== modified file 'backportpackage' --- backportpackage 2012-03-28 21:25:33 +0000 +++ backportpackage 2012-04-03 15:13:48 +0000 @@ -20,6 +20,7 @@ import optparse import os +import re import shutil import sys import tempfile @@ -28,6 +29,8 @@ from devscripts.logger import Logger +from distro_info import DebianDistroInfo + from ubuntutools.archive import (SourcePackage, DebianSourcePackage, UbuntuSourcePackage, DownloadError) from ubuntutools.config import UDTConfig, ubu_email @@ -193,7 +196,15 @@ return srcpkg def get_backport_version(version, suffix, upload, release): - backport_version = version + ('~%s1' % release) + debian_distro_info = DebianDistroInfo() + debian_codenames = debian_distro_info.supported() + if release in debian_codenames: + index = debian_codenames.index(release) + release_version = debian_distro_info.supported(result="release")[index] + backport_version = version + '~bpo' + \ + re.sub("\.", "", release_version) + '+1' + else: + backport_version = version + ('~%s1' % release) if suffix is not None: backport_version += suffix elif upload and upload.startswith('ppa:'):