Fix linux_upstream_full compute for version with modifier

From: Julien Danjou <julien@danjou.info>

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.

svn path=/dists/trunk/linux/; revision=19308

debian/changelog

@@ -1,3 +1,11 @@
+linux (3.5-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * genorig: Fix linux_upstream_full compute for version with modifier,
+    thanks to Julien Danjou (Closes: #683824)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 04 Aug 2012 14:43:08 +0100
+
 linux (3.5-1~experimental.1) experimental; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_3.5

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