Merge 2.10.8-1 from debian unstable

[mjc]

Binary package hint: gthumb

gThumb 2.10.6 is badly broken in the fullscreen mode - lots of crashes :-(

I suggest that you pull in 2.10.8 as soon as possible.

- Mike (a gThumb developer)

This applies to hardy as well now.

[Pedro Villavicencio (pedro)]

Thanks for let us know Michael, that can't be done now since Gutsy is in freeze state, however it can be included later with gutsy updates. thanks you.

[Wouter Stomp (wouterstomp-deactivatedaccount)]

Can this please be done for hardy?

[Wouter Stomp (wouterstomp-deactivatedaccount)]

Changes since previous version:

    * If the directory doesn't exists go to the closest existing parent. Fixes bug #495575 – infinite loop when browsing deleted dirs
    * Fixed bug #Bug 498741 – gthumb always saves thumbnails despite the gconf option in apps -> gthumb -> browser -> save_thumbnails set to false
    * Fixed bug #500719 – segfault when canceling batch operations
    * Fixed bug #486886: Crash opening an image with no Exif IFD1
    * Fixed bug #487982: can freeze gthumb during printing
    * Fixed a printing crash, g_free -> gtk_paper_size_free
    * Fixed bug #492111: Doesn't rotate pictures while importing
    * Fixed bug #492262: Rotate removes thumbnail
    * Fixed bug #492260: Crash on rotate on x86_64
    * Fixed bug #492169: Crash when moving directory to trash
    * Fixed bug #492370: monitor name conflict with libc on solaris10
    * Fixed exif tag read/write functions, so they can access 32-bit values correctly on 64-bit platforms
    * Fixed bug #476989: gthumb doesn't move images if destination directory is selected from folder drop down list
    * Fixed bug #495529: Search not working
    * Fixed bug #498995: gthumb gets it's locking wrong and crashes
    * When sorting by exif time, fall back to sorting by mtime if no exif time is present.
    * Fixed bug #438027: cancel isn't honoured in reset exif orientation progress dialog or rotation-tool dialog
    * Fixed bug #499795: silently fails to save bmp picture
    * Fixed bug #496140: Crop Window opens too large for dual-screens

[Wouter Stomp (wouterstomp-deactivatedaccount)]

(bug numbers are gnome bugzilla numbers, so the automatic links are not right)

[Wouter Stomp (wouterstomp-deactivatedaccount)]

2.10.8-1 is in debian unstable now so it could be merged. Debian changelog:

 gthumb (3:2.10.8-1) unstable; urgency=low

   * Package adopted by me (Closes: #457591)
   * New upstream release (Closes: #457509):
     - fixes crash trying to print (Closes: #457350, #454298, #446413)
     - fixes command line options parsing (Closes: #298881)
   * debian/compat bumped to 5
   * debian/control:
     - Standards-Version 3.7.3
     - dependencies updated (and wrapped)
     - depending on unversioned scrollkeeper (Closes: #456602, #457021)
     - recommending yelp (Closes: #340820)
     - changed the Maintainer field
     - added Homepage field (removing old pseudo-field)
     - added Vcs-Svn and Vcs-Browser fields
     - added Conflicts: gthumb (<< 3:2.10.8-1) to gthumb-data because of
       conflicting files with older packages.
   * debian/patches: converted to quilt
     - 02-preserve_gnome-doc-utils.make added (compilation failed otherwise)
     - 04-fix_gnome.desktop.in added (removing Encoding line)
     - 06-fix_locales.patch added (Closes: #403736, #404086)
     - 07-add_keybinding_DoNotSave.patch added (Closes: #310095)
     - 08-fix_zooms.patch added (Closes: #452929)
   * debian/copyright fixed.

 -- David Paleino <email address hidden> Sun, 27 Jan 2008 10:26:18 +0100

[Olli Salo (olli-salo)]

One vote from me, too! Like said, fullscreen with 2.10.6 is really bad. Would love to see 2.10.8 merged to Hardy before the official Hardy release.

[Tormod Volden (tormodvolden)]

I guess the best we can hope for now, is to get it in gutsy-backports and hardy-backports. I checked the MoM merge report, and it looks ugly. For those interested, I added the Debian version to my PPA archive.

[Okki (gnomelibre)]

2.10.7 and 2.10.8 are only bugfix releases (eight bugs which can make the application crash and a lot of other annoying bugs). So, why don't we already have this version (released on January 1, 2008...) in Hardy ?

[Tormod Volden (tormodvolden)]

Yes, Gnome packages usually get updated regularly and long into the development cycle. I guess this one was missed because it's not installed by default any longer and is not given priority (IMHO sad since I find it much better than eog). And finally, someone has to sit down and do the merge, that is, ensure that previous Ubuntu changes are brought along if needed.

Personally, if I knew, I would have worked on this earlier, but now with Hardy frozen, I am not gonna do that merge if I am not sure my work will be accepted into Hardy.

[Okki (gnomelibre)]

Can you contact the release management team to see whether they can regard it as an exceptional circumstance ?

https://wiki.ubuntu.com/FeatureFreeze :

# is a reasonable fix for an important bug,
# other exceptional circumstances, as judged by the release managers.

[Emilio Pozuelo Monfort (pochu)]

Tormod, we are going to update this for Hardy. Should you have some time to do this today, please go ahead and attach your work here (or leave a link to where it is). If you can't make it for today I'll likely do it so that we can get it in Hardy.

[Tormod Volden (tormodvolden)]

Sorry, I don't have time today. Thanks for doing it.

[Nicolai P (nicolaip)]

I'm merging 3:2.10.8-1 from SID/testing.

[Tormod Volden (tormodvolden)]

Excellent. Can you please also add the upstream patch in bug #223574?

[Nicolai P (nicolaip)]

Sure.

[Nicolai P (nicolaip)]

.diff.gz for 2.10.8-1ubuntu1.
get-orig-source rule is included in debian/rules
Patch for bug #223574 is inside.

All files (*.orig.tar.gz, *.dsc etc.) at http://www.rootshell.be/~nicolai/ubuntu/gthumb/

[Tormod Volden (tormodvolden)]

Thanks, can you please also provide a debdiff from the Debian version?

[Tormod Volden (tormodvolden)]

BTW, you should mention in the changelog what the remaining Ubuntu changes are.

[Tormod Volden (tormodvolden)]

The package is in main (not universe), so please correct the Maintainer field in debian/control.

Did you actually merge the Ubuntu changes, or just sync with Debian unstable? Dropped Ubuntu changes should also be commented on in the changelog.

Your 08-fix-mime-in-desktop-file.patch modifies the same line in gthumb.desktop as 04-fix_gthumb.desktop.in.patch does in gthumb.desktop.in. Does that make sense, isn't the first file generated from the other by "configure"? I'd say you can modify the 04 to include all the changes.

[Nicolai P (nicolaip)]

OK. I am working on it. Thanks.

[Daniel Holbach (dholbach)]

Martin: can you please take a look at it?

[Martin Pitt (pitti)]

OK, I'll sponsor this as soon as Intrepid opens. For the fullscreen issue, we might actually do an SRU (sorry, I rejected the tasks because I thought they were obsolete, but apparently they were intended).

[Martin Pitt (pitti)]

For doing a stable update, is there a way to reproduce such a crash?

[Tormod Volden (tormodvolden)]

One test case:
 $ cp /usr/share/example-content/logo-Ubuntu.png /tmp
 $ gthumb --fullscreen /tmp/logo-Ubuntu.png
 Now press the Delete key and confirm Move to Trash with alt-M. The image is deleted and gthumb segfaults.

[Nicolai P (nicolaip)]

Here's a debdiff from the Debian version.

09-autoconf.patch is in debian/patches, but not in debian/series, because the configure script then says that it can't make config.status. Maybe this has especially to do with line 25410. Somebody should have a look at this. 08-lpi.patch does not make much sense without that.

It builds and installs fine in pbuilder. I tested the .deb with a Xubuntu live cd.

gthumb (3:2.10.8-1ubuntu1) intrepid; urgency=low

  * Merged from SID (LP: #153572)
  * Only bunzip2 archive was available, so I created a gunzip archive myself
  * Adjusted 04-fix_gthumb.desktop.in.patch to also fix MIME types, not only
    removes Encoding=UTF-8 line anymore (LP: #223574)
  * Remaining Ubuntu Changes:
    - Launchpad Integration (08-lpi.patch)
    - Add Maintainer Mode to aclocal.m4 and configure and the consequential changes (09-autoconf.patch)
  * Removed Ubuntu Changes:
    - 21_dont_skip_file_type.dpatch (included upstream)
    - 22_paper_size_free.dpatch (included upstream)
  * 09-autoconf.patch is included but not 'activated' because of problems with
    configure

 -- Nicolai Spohrer <email address hidden> Wed, 30 Apr 2008 18:05:52 +0200

[Tormod Volden (tormodvolden)]

Thanks, a lot of good work there. This is not the easiest merge to do, with many old Ubuntu changes in awkward places. Just a style matter though, please make the changelog: "Merge from Debian unstable (LP: #153572), remaining changes:". For the maintainer field see <https://wiki.ubuntu.com/DebianMaintainerField>.

The 09-autoconf.patch issue is a little tricky, and please someone correct me if I get this wrong in the following guesswork: autoconf will use aclocal.m4 while generating configure from configure.in. The Debian packager will usually run autoconf (through autoreconf) to generate configure after applying patches and before building diff.gz. Usually when building the package in Ubuntu one does not rerun autoreconf, so the Ubuntu debdiff should contain (inline) the generated changes to configure. If you need Ubuntu changes in configure, you should therefore edit configure.in (and aclocal.m4) and rerun autoreconf. Or is there a prettier way to do it? Just edit configure and not touch configure.in since autoreconf will not be run again anyway?

I have some more questions, not that something necessarily is wrong, but I don't get it:

1. What is the bzip2 archive in question?

2. Do we need the get-orig-source in the Ubuntu delta - it should rather be in Debian, right?

3. 08-lpi.patch has the "launchpad-integration" line twice? I can see this in 09-autoconf.patch also.

4. Why do we need --maintainer-mode if Debian doesn't?

[Nicolai P (nicolaip)]

Hello.
1. I confused something up. There was no need to repack anything, there are gunzip archives available on the project page.
2. Right. It's not really needed here. But I added it because I didn't want to reupload the orig sources to launchpad. However...
3. Yes, that's right. I also wondered about that. Anyway, the lines in the earlier Ubuntu versions were also twice.
4. Yeah, that would make things much easier.

[Tormod Volden (tormodvolden)]

2. Our archive uses the orig.tar.gz from the Debian source package anyway.
3. Yes, this is probably something that has been brought along since a long time
4. In fact, Debian has a new maintainer-mode patch in their new experimental package...

[Nicolai P (nicolaip)]

Hmpf. I removed some of the strange changes at the end and now it compiles without problems (with autoconf.patch).
But somebody should have a look at Launchpad Integration, if I e.g. press F1 in the program, I see an error message. There was another changed line in the previous versions of the patch, but the upstream code has changed. Somebody should check that.
And now there are only single launchpad-integration lines.

gthumb (3:2.10.8-1ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable (LP: #153572), remaining changes:
    - Adjusted 04-fix_gthumb.desktop.in.patch to also fix
    MIME types, not only removes Encoding=UTF-8 line anymore (LP: #223574)
    - Launchpad Integration (08-lpi.patch)
    - Add Maintainer Mode to aclocal.m4 and configure and the consequential changes (09-autoconf.patch)
  * Removed Ubuntu Changes:
    - 21_dont_skip_file_type.dpatch (included upstream)
    - 22_paper_size_free.dpatch (included upstream)

 -- Nicolai Spohrer <email address hidden> Thu, 01 May 2008 17:17:13 +0200

[Tormod Volden (tormodvolden)]

As you can see on https://wiki.ubuntu.com/UbuntuDevelopment/Merging the new changelog should include previous Ubuntu changelog entries... The easiest way to get a merged changelog is to fish it out from the merge-o-matic tarball.

All the many, small, difficult changes for configure in 09-autoconf.patch is due to configure having been autogenerated. It's almost like a binary patch :)

If you now can limit the changelog text to 72 characters per line (to look good in the changes file, on a terminal etc), I have no further comments. Thanks for all the hard work!

[Nicolai P (nicolaip)]

Thanks :)

The changelog now contains the earlier Ubuntu changes (in timestamp-chronotical order, as suggested on #ubuntu-motu)

Changelog is "shorter" now.

gthumb (3:2.10.8-1ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable (LP: #153572), remaining changes:
    - Adjusted 04-fix_gthumb.desktop.in.patch to also fix
      MIME types, not only removes Encoding=UTF-8 line
      anymore (LP: #223574)
    - Launchpad Integration (08-lpi.patch)
    - Add Maintainer Mode to aclocal.m4 and configure and the
      consequential changes (09-autoconf.patch)
  * Removed Ubuntu Changes:
    - 21_dont_skip_file_type.dpatch (included upstream)
    - 22_paper_size_free.dpatch (included upstream)

 -- Nicolai Spohrer <email address hidden> Thu, 01 May 2008 21:27:26 +0200

[Martin Pitt (pitti)]

I added a few missing pieces from the merge (you dropped some important i18n fixes in debian/rules) and uploaded. Thank you!

[Martin Pitt (pitti)]

I'll look into the Hardy merge later.

[Launchpad Janitor (janitor)]

This bug was fixed in the package gthumb - 3:2.10.8-1ubuntu1

---------------
gthumb (3:2.10.8-1ubuntu1) intrepid; urgency=low

  [ Nicolai Spohrer and Martin Pitt ]
  * Merge from Debian unstable (LP: #153572), remaining changes:
    - Adjusted 04-fix_gthumb.desktop.in.patch to also fix
      MIME types, not only removes Encoding=UTF-8 line
      anymore (LP: #223574)
    - Launchpad Integration (08-lpi.patch)
    - Add Maintainer Mode to aclocal.m4 and configure and the
      consequential changes (09-autoconf.patch)
    - debian/rules: Build PO template on package build.
    - debian/rules: Add gettext domain to *.desktop and *.server files.
  * Removed Ubuntu Changes:
    - 21_dont_skip_file_type.dpatch (included upstream)
    - 22_paper_size_free.dpatch (included upstream)

gthumb (3:2.10.8-1) unstable; urgency=low

  * Package adopted by me (Closes: #457591)
  * New upstream release (Closes: #457509):
    - fixes crash trying to print (Closes: #457350, #454298, #446413)
    - fixes command line options parsing (Closes: #298881)
  * debian/compat bumped to 5
  * debian/control:
    - Standards-Version 3.7.3
    - dependencies updated (and wrapped)
    - depending on unversioned scrollkeeper (Closes: #456602, #457021)
    - recommending yelp (Closes: #340820)
    - changed the Maintainer field
    - added Homepage field (removing old pseudo-field)
    - added Vcs-Svn and Vcs-Browser fields
    - added Conflicts: gthumb (<< 3:2.10.8-1) to gthumb-data because of
      conflicting files with older packages.
  * debian/patches: converted to quilt
    - 02-preserve_gnome-doc-utils.make added (compilation failed otherwise)
    - 04-fix_gnome.desktop.in added (removing Encoding line)
    - 06-fix_locales.patch added (Closes: #403736, #404086)
    - 07-add_keybinding_DoNotSave.patch added (Closes: #310095)
    - 08-fix_zooms.patch added (Closes: #452929)
  * debian/copyright fixed.

 -- Martin Pitt <email address hidden> Wed, 14 May 2008 17:32:19 +0200

[Tormod Volden (tormodvolden)]

The package doesn't build since it depends on libiptcdata which is in universe.

[Åskar (olskar)]

Perhaps libiptcdata should be moved into main?

[Martin Pitt (pitti)]

Tormod Volden [2008-05-19 19:33 -0000]:
> The package doesn't build since it depends on libiptcdata which is in
> universe.

Right, that would either need a MIR, or the dependency must be dropped.

[Tormod Volden (tormodvolden)]

libiptcdata support has been requested in bug #213367 by the way. What are the chances for a MIR in Hardy?

[Martin Pitt (pitti)]

Tormod Volden [2008-05-20 11:35 -0000]:
> libiptcdata support has been requested in bug #213367 by the way. What
> are the chances for a MIR in Hardy?

In Hardy? Nil, I'm afraid, we do these kind of archive reorganization
in stable releases. For Intrepid, filing an MIR is ok, of course.

[mjc (mjc-avtechpulse)]

FYI, gthumb trunk has dropped libiptcdata and uses exiv2 instead.

I do not know when trunk will be ready for a release; it is currently being ported to gio.

- Mike

[Tormod Volden (tormodvolden)]

Here is a patch to drop the dependency on libiptcdata, so we get the package built. If someone have success with a MIR for libiptcdata, we can put it back later. The other option is of course to push gthumb to universe...

[Martin Pitt (pitti)]

Thanks, Tormod. Uploaded.

[Martin Pitt (pitti)]

Accepted into -proposed, please test and give feedback here

[Bryan Quigley (bryanquigley)]

Looks good from me. Note: I didn't test any importing.
Looking for some specific tests?

[Martin Pitt (pitti)]

Works for me with the hardy-proposed .debs as well. Seb tested it in bug 152246.

[Martin Pitt (pitti)]

Copied to hardy-updates.

[Miika Laaksonen (miika)]

Version updated to hardy-updates is 2.10.8-0ubuntu1
At least gthumb.desktop is still old one

[Tormod Volden (tormodvolden)]

Yes, the version in hardy-updates is not the same as in intrepid and does not have all the fixes (all the upstream ones obviously, but not the Debian and Ubuntu ones). Martin, can you please comment on this?

[Martin Pitt (pitti)]

intrepid/sid did a package split, and changed some other things (new recommends, complete change of patch system, etc.) which are not appropriate in stable releases.

[Mantas Kriaučiūnas (mantas)]

Ghtumb 2.10.8 was included into Baltix 3.6 2008-06