Please merge gnumeric 1.12.0-1 (universe) from Debian unstable

[Allison Randal]

I've attached a debdiff for a traditional merge of gnumeric, since it is not up-to-date in the UDD branches due to an import failure. It had to be manually merged because of a conflict in the Build-Depends lines of debian/control (all trivial, some entries on different lines, and some version updates to dependencies for gnumeric 1.12.0).

This is a desirable version update from Debian, since it moves the package from gtk2 to gtk3. However, it is currently blocked by the goffice package, which also requires a manual merge from Debian to get version 0.10.0-1. (Version 1.12.0 of gnumeric requires libgoffice-0.10-dev >= 0.10.0, but the current version in raring is libgoffice-0.8-dev at 0.8.17.)

Also note that gnumeric gnumeric_1.12.0-1 is not built for all architectures yet on Debian.

This merge drops one Ubuntu patch, a manual call to intltool-update, as it was causing a build failure, apparently conflicting with the new use of dh_autotools-dev_updateconfig in the Debian packages. That leaves only one Ubuntu-specific change in the attached debdiff.

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "gnumeric_1.12.0-1ubuntu1.debdiff" of this bug report has been identified as being a patch in the form of a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. In the event that this is in fact not a patch you can resolve this situation by removing the tag 'patch' from the bug report and editing the attachment so that it is not flagged as a patch. Additionally, if you are member of the ubuntu-sponsors team please also unsubscribe the team from this bug report.

[This is an automated message performed by a Launchpad user owned by Brian Murray. Please contact him regarding any issues with the action taken in this bug report.]

[Colin Watson (cjwatson)]

I'm working on the build failure here; there's a relevant patch in upstream git.

I think that dropping intltool-update was wrong here. I'm fairly sure we still need it for language pack support via Launchpad translations, and I don't see the build failure you mentioned when restoring those lines to debian/rules; there's no conceptual reason they should conflict with dh_autotools-dev_updateconfig, so perhaps this was just a mis-resolved merge conflict?

[Launchpad Janitor (janitor)]

This bug was fixed in the package gnumeric - 1.12.1-1ubuntu1

---------------
gnumeric (1.12.1-1ubuntu1) raring; urgency=low

  * Merge from Debian unstable. Remaining changes:
    - debian/control: Promote gnumeric-doc to Recommends in package gnumeric
      so that help gets installed automatically.
    - debian/rules: Run intltool-update in po{,-functions}/.
  * Dropped changes applied in new version:
    - debian/patches/introspection-fixes.patch:
    - debian/patches/python-multiarch.patch:

gnumeric (1.12.1-1) unstable; urgency=low

  * New upstream release, first of the new stable series.
  * [debian/control]
    * Bumped goffice build dependency as per configure.ac .
  * [debian/patches/no-nested-externs-error] Added. Don't build
    -Werror=nested-externs as this breaks a test used for GLIB_WITH_NLS
    which in turn makes the locales directory come out wrong.
  * [debian/gnumeric.install] Include ssdiff.
 -- Jeremy Bicha <email address hidden> Sun, 10 Mar 2013 15:35:32 -0400