Ubuntu
gnome-chemistry-utils package

  1. Bug #233963
  2. Comment #25

Comment 25 for bug 233963

Revision history for this message
Matthias Mailänder (mailaender) wrote :

I only touched the files that are listed in https://merges.ubuntu.com/g/gnome-chemistry-utils/REPORT under "Conflicts" and applied the Debian changes to the files. debian/rules must have been automatically modified, I removed addition on my local copy.

I simply kicked out all the old patches from 00list as I thought they are for a whole different release series, but I did not delete the files because I thought they might be vital for something I don't understand and I did not read "debian/patches: added fix_bodr8_crash.dpatch to fix crash if BODS >= 8 is used. Can be dropped next sync." I will remove it then.

Translations are only maintained upstream and I did not apply anything. There should be no diff at all between them. I checked the it.po against SVN and there is a small addition, de.po is also slightly different (mostly formatting). Maybe these are old 0.8-series strings that the ubuntu-merge-o-matic pulled back in.

I don't know what to do now? Start from scratch with a new package from Debian or clean up the awful merge?