Comment 7 for bug 662355

Just an update

manual merge either way doesn't work

Here is my PPA rejection message:

Rejected:
File gelemental_1.2.0.orig.tar.gz already exists in Primary Archive for Ubuntu, but uploaded version has different contents. See more information about this error in https://help.launchpad.net/Packaging/UploadErrors.
Files specified in DSC are broken or missing, skipping package unpack verification.

Format: 1.8
Date: Mon, 27 Sep 2010 00:51:48 +0100
Source: gelemental
Binary: gelemental libelemental0 libelemental-dev gelemental-dbg libelemental0-dbg libelemental-doc
Architecture: source
Version: 1.2.0-5ubuntu1
Distribution: natty
Urgency: low
Maintainer: Ubuntu Developers <email address hidden>
Changed-By: Angel Abad <email address hidden>
Description:
gelemental - Periodic Table viewer
gelemental-dbg - Periodic Table viewer (main application debugging symbols)
libelemental-dev - Periodic Table viewer (development files)
libelemental-doc - Periodic Table viewer (API documentation)
libelemental0 - Periodic Table viewer (data and shared library)
libelemental0-dbg - Periodic Table viewer (shared library debugging symbols)
Launchpad-Bugs-Fixed: 662355
Changes:
gelemental (1.2.0-5ubuntu1) natty; urgency=low

 * Merge from debian unstable (LP: #662355). Remaining changes:
   - debian/control: Require libgtkmm >= 2.18.0 for fix_gtkmm_2.18.dpatch
   - Add binary -dbg packages with debugging symbols:
       - debian/control:
         + add gelemental-dbg stanza
         + add libelemental0-dbg stanza
       - debian/rules:
         + split dh_strip calls in binary-arch target
         + add appropriate --dbg-package flags to dh_strip calls
Checksums-Sha1:
55b88d51923dbb89c83d25a8f736a23fac4595c0 1910 gelemental_1.2.0-5ubuntu1.dsc
7797d76b8e4aa75f8cd90feb69b79651cedc9e6b 700823 gelemental_1.2.0.orig.tar.gz
d87a0ab38a94a1dba48bbfbede51d960f4a3322b 26355 gelemental_1.2.0-5ubuntu1.diff.gz
Checksums-Sha256:
f09d4479578e1024f05bf464c9f59f71bfecdd644f3f53cf208edfd0f30910bb 1910 gelemental_1.2.0-5ubuntu1.dsc
c6245f05954d62c8dccf6d85817da110eb6822974776d6368b97f32760aada54 700823 gelemental_1.2.0.orig.tar.gz
6048cf6703577a39eac2ac23ebc94cbf6c61622b6296f66b8b76771e7d9fa3e1 26355 gelemental_1.2.0-5ubuntu1.diff.gz
Files:
15374d20b4ec0566e19311055751dbe7 1910 science optional gelemental_1.2.0-5ubuntu1.dsc
94cc73c76a02f75598f579ff57696805 700823 science optional gelemental_1.2.0.orig.tar.gz
3c28f33e7782ea34f9e78463d82e2e0c 26355 science optional gelemental_1.2.0-5ubuntu1.diff.gz

Regards