Please merge gnome-chemistry-utils 0.10.9-1 (universe) from Debian testing (main)

Hi Morten, are you still working on this? I can take over if you'd like.

Go ahead, Iain!

Please note version 0.8.7-2 ships several changes we need to analyze properly:

 gnome-chemistry-utils (0.8.7-2) unstable; urgency=low
 .
   * debian/control (Build-Depends, Depends): xulrunner transition (closes:
     #480804). Changed to iceape-dev.
     [...]
     (Description): Adjusted gcu-plugin description for xulrunner transition.
     [...]
   * debian/gcu-plugin.install: Adjusted for new plugin directory.
   * debian/gcu-plugin.links: Ditto.
   [...]
   * debian/rules (config.status): Set XULRUNNER_CLIENT and determine new
     plugin installation path.

Only debian/ directory, full diff (8.6M) available upon request.

gnome-chemistry-utils (0.10.5-1ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #233963), remaining changes:
    - debian/control: add firefox/abrowser support
    - debian/rules: add --with-mozilla-libdir=/usr/lib/xulrunner-addons/plugins/
      to configure flags
    - debian/gcu-plugin.{links,dirs}: remove not needed debhelper files
    - debian/gcu-plugin.install: use mozilla-libdir from above
    - debian/control: build depend on xulrunner-dev
  * Dropped changes:
    - debian/patches: fix_bodr8_crash.dpatch, applied upstream

 -- Ilya Barygin <email address hidden> Thu, 09 Jul 2009 14:05:44 +0400

Thanks for the merge. Things look good but the browser plugins aren't working. The plugins show up in firefox, but when I open a test file nothing happens and sometimes the browser freezes. It would be good to get that fixed before uploading.

Unsubscribing the sponsors for now, please resubscribe when the issue is resolved.

I just added a bug as a duplicate of this one. During the development cycle, gchempaint was added to this source package in Debian, and the source package of gchempaint was removed from Debian (and autoremoved from Karmic). Since we have an older version of gnome-chemistry-utils that was released before gchempaint joined it, Karmic does not have any binary package for gchempaint.

I am tried a merge between the old Ubuntu 0.8 and the latest 0.10 in Debian testing, but ran into problems. The package has been uploaded at http://revu.ubuntuwire.com/p/gnome-chemistry-utils for inspection.

My upload has been archived at REVU because it is a merge and not a new package. It does not build, I do not understand the error message, so I have to give up. This task needs someone who is far more experienced in packaging.

Which error?

I posted the error message at REVU which is currently offline (yeah.. great). I had the problem that pbuilder-satisfydepends-dummy told me that some packages are virtual, but they were not virtual packages, which was irritating for a packaging newbie and frustrated me 2 weeks ago. Today I found out via Google that I had to enable universe in pBuilder: https://wiki.ubuntu.com/PbuilderHowto#Universe%20support

Now it builds for the first time on my laptop *hooray* but the build fails again :( It says:

dh_install -a --sourcedir=/tmp/buildd/gnome-chemistry-utils-0.10.8/debian/tmp --list-missing -X.la
cp: cannot stat `/tmp/buildd/gnome-chemistry-utils-0.10.8/debian/tmp/usr/lib/gchemutils/chem-viewer': No such file or directory
dh_install: cp returned exit code 1
make: *** [binary-arch] Error 1
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
E: Failed autobuilding of package
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env
I: removing directory /var/cache/pbuilder/build//6437 and its subdirectories

I also found out that 0.10.9 is now available in Debian testing, which includes my updated German translations. Do I have to get through this annoying Ubuntu/Debian merge operation again? Anyway, I need to take a break now.

1) The error indicates, that the plugin has not been built. The configure output and the build-log should tell why.

2) Yes, you have to merge parts of the Ubuntu changes into the Debian package (I'm the maintainer for Debian). But I tried to make this as easy as possible (just the browser in the debian/control files and the plugin links).

I have to admit that I might be overstrained with this task as I can't even find the build-log. I asked the previous uploader Alexander Sack (found via https://merges.ubuntu.com/universe.html) for help.

Run debuild or pdebuild. It leaves a .build file together with the source files and packages.

I merged it again against your latest version and it built succesful at first try. Thanks for the great package. I guess it is too late to get it into Ubuntu 9.10 Karmic Koala. Maybe you can upload it to https://launchpad.net/~debichem/+archive/ppa

Debdiff is now a lot smaller.

About the debdiff:

- debian/rules: There is already the --with-mozilla-libdir switch a few lines above the one you added. No need to touch it
- gcu-plugin.dirs, gcu-plugin.links, debian/control: Ok.

But what are these changes in it.po and the patch in debian/patches are about? They are not mentioned in debian/changelog. The patch in debian/patches seems obsolete (IIRC we applied this a long time ago and it is not listed in debian/patches/00list). So what about the difference to it.po? Is this a patch that should be applied upstream? Is this a patch that has been aplied in the past and should not be applied now?

Regards, Daniel

All .po files have changes applied?

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?

Get the Debian package and only fix gcu-plugin.dirs, gcu-plugin.links, debian/control.

The usual way would be to check the changes wih every merge and limit changes to the required level. Useful patches, e.g. translation fixes, should be forwarded to upstream or to me - I have access to the upstream VCS too.

Hi,

As it seems the debdiff is not yet ready, I'll unsubscribe u-u-s. Please subscribe the sponsors again when your debdiff is ready.

Thanks,
Fabrice

debdiff 'gnome-chemistry-utils_0.10.9-1.dsc' 'gnome-chemistry-utils_0.10.9-1ubuntu1.dsc' > debian2ubuntu.debdiff

debdiff '/home/matthias/Desktop/ubuntu-merge-o-matic/gnome-chemistry-utils/gnome-chemistry-utils_0.8.6-1ubuntu7.dsc' '/home/matthias/Desktop/manual-merge/gnome-chemistry-utils_0.10.9-1ubuntu1.dsc' > ubuntu2ubuntu.debdiff

I created new clean debdiffs directly from the Debian package. The .po files have been sent to Jean Brefort to check if they contain useful addition or wether are just auto-merge trash.

Looks good to me. But you probably missed to adjust the Depends line in debian/control(?).

-Depends: ${shlibs:Depends}, ${misc:Depends}, iceweasel | galeon
+Depends: ${shlibs:Depends}, ${misc:Depends}, firefox | galeon

(from your older debdiff)

#31 has been fixed, thanks for the hint

Matthias, thanks for doing this merge, Daniel, thanks for your assistance! Uploading.

This bug was fixed in the package gnome-chemistry-utils - 0.10.9-1ubuntu1

---------------
gnome-chemistry-utils (0.10.9-1ubuntu1) lucid; urgency=low

  * manual merge from Debian testing, fixes LP: #233963
    * gcu-plugin.dirs, gcu-plugin.links: iceweasel → firefox; iceape → seamonkey
    * debian/control: added MOTU, iceweasel → firefox
 -- Matthias Mailaender <email address hidden> Sa, 05 Dez 2009 09:43:24 +0100