=== modified file 'syncpackage'
--- syncpackage	2011-10-14 20:28:57 +0000
+++ syncpackage	2011-10-20 16:09:00 +0000
@@ -61,16 +61,6 @@ class Version(debian.debian_support.Vers
         version_without_epoch = ':'.join(parts)
         return version_without_epoch
 
-    def get_related_debian_version(self):
-        related_debian_version = self.full_version
-        uidx = related_debian_version.find('ubuntu')
-        if uidx > 0:
-            related_debian_version = related_debian_version[:uidx]
-        uidx = related_debian_version.find('build')
-        if uidx > 0:
-            related_debian_version = related_debian_version[:uidx]
-        return Version(related_debian_version)
-
     def is_modified_in_ubuntu(self):
         return 'ubuntu' in self.full_version
 
@@ -142,15 +132,13 @@ def sync_dsc(src_pkg, debian_dist, relea
                  src_pkg.source, ubuntu_ver, new_ver)
     Logger.debug('Needs source tarball: %s', str(need_orig))
 
-    cur_ver = ubuntu_ver.get_related_debian_version()
     if ubuntu_ver.is_modified_in_ubuntu():
         if not force:
             Logger.error('--force is required to discard Ubuntu changes.')
             sys.exit(1)
 
-        Logger.warn('Overwriting modified Ubuntu version %s, '
-                    'setting current version to %s',
-                    ubuntu_ver.full_version, cur_ver.full_version)
+        Logger.warn('Overwriting modified Ubuntu version %s.',
+                    ubuntu_ver.full_version)
     if simulate:
         return
 
@@ -187,7 +175,7 @@ def sync_dsc(src_pkg, debian_dist, relea
         # create the changes file
         changes_filename = "%s_%s_source.changes" % \
                            (src_pkg.source, new_ver.strip_epoch())
-        cmd = ["dpkg-genchanges", "-S", "-v" + cur_ver.full_version,
+        cmd = ["dpkg-genchanges", "-S", "-v" + ubuntu_ver.full_version,
                "-DDistribution=" + release,
                "-DOrigin=debian/" + debian_dist,
                "-e" + uploader]
@@ -246,7 +234,7 @@ def sync_dsc(src_pkg, debian_dist, relea
         subprocess.check_call(cmd)
 
         # Build source package
-        cmd = ["debuild", "--no-lintian", "-S", "-v" + cur_ver.full_version]
+        cmd = ["debuild", "--no-lintian", "-S", "-v" + ubuntu_ver.full_version]
         if need_orig:
             cmd += ['-sa']
         if keyid:
@@ -347,7 +335,6 @@ def copy(src_pkg, release, bugs, simulat
                       ubuntu_pkg.version, src_pkg.version)
 
         ubuntu_version = Version(ubuntu_pkg.version.full_version)
-        base_version = ubuntu_version.get_related_debian_version()
         if not force and ubuntu_version.is_modified_in_ubuntu():
             Logger.error('--force is required to discard Ubuntu changes.')
             sys.exit(1)
@@ -360,12 +347,11 @@ def copy(src_pkg, release, bugs, simulat
                          'mismatch. A fake sync using --no-lp is required.')
             sys.exit(1)
     except udtexceptions.PackageNotFoundException:
-        base_version = Version('~')
         Logger.normal('Source %s -> %s/%s: not in Ubuntu, new version %s',
                       src_pkg.source, ubuntu_series, ubuntu_pocket,
                       src_pkg.version)
 
-    changes = get_debian_changelog(debian_spph, base_version)
+    changes = get_debian_changelog(debian_spph, ubuntu_version)
     if changes:
         changes = changes.strip()
         Logger.normal("New changes:\n%s", changes)