Bug#683824: gencontrol fails to generate tarballs for version with modifier

[Julien Danjou <acid@debian.org>]

Package: linux
Severity: minor
Tags: patch

>From 89bfc6122f508ee4d4bd02e710631fb4e0bcf66c Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sat, 4 Aug 2012 15:16:19 +0200
Subject: [PATCH] Fix linux_upstream_full compute for version with modifier

If you try to use genorig on a version with a modifier (like ~rc1), it will
fail because self.linux_upstream_full will be equal to the short version
rather than version-modifier.
---
 debian/lib/python/debian_linux/debian.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
index 7daaa03..a577526 100644
--- a/debian/lib/python/debian_linux/debian.py
+++ b/debian/lib/python/debian_linux/debian.py
@@ -154,7 +154,7 @@ $
             self.linux_upstream = u'-'.join((d['version'], d['modifier']))
         else:
             self.linux_upstream = d['version']
-        self.linux_upstream_full = d['version'] + (d['update'] or u'')
+        self.linux_upstream_full = self.linux_upstream + (d['update'] or u'')
         self.linux_dfsg = d['dfsg']
         self.linux_revision_experimental = match.group('revision_experimental') and True
         self.linux_revision_other = match.group('revision_other') and True
-- 
1.7.10.4