Comment 3 for bug 174935

F-Spot 0.4.1 has been uploaded to Debian, but is still in incoming.debian.org. I'll change this to a sync bug once it is uploaded to the archive.

For now, the debian/changelog entry:

f-spot (0.4.1-1) unstable; urgency=low

  [ Mirco Bauer ]
  * New upstream version.
    + Fixes NDesk.Glitz FTBFS. (Closes: #441686)
    + Fixes crash when double clicking an image or attaching a tag while the
      image is open. (Closes: #447986)
  * debian/control:
    + Added myself to Uploaders.
    + Updated cli-common-dev build-dependency to >= 0.4.4.
    + Updated Standards-Version to 3.7.3, no changes needed.
    + Added sqlite and sqlite3 to Suggests, needed for the
      f-spot-sqlite-upgrade script.
    + Added libflickrnet2.1.5-cil, libmono-addins0.2-cil and
      libmono-addins-gui0.2-cil to build-dependencies.
  * debian/copyright:
    + Rewritten, checked copyright and licenses of all source files.
  * debian/patches/01_build-system.dpatch:
    + Disabled as upstream allows to link against system ndesk-dbus now.
  * debian/patches/10_cs-changes.dpatch:
    + Disabled as PicasaWeb export, .kdc file support and sqlite3 support are
      already fixed upstream.
  * Added beagle-dev to build-dependencies for beagle support.
  * debian/patches/fix_libfspot_linkage.dpatch
    debian/patches/fix_libfspoteog_linkage.dpatch
    debian/patches/fix_libfspotjpegtran_linkage.dpatch:
    + Wrote patch to link correctly against used libraries.
  * debian/patches/20_refresh-menus-on-extensions.dpatch:
    + Refresh the Export and Tools menus on new or removed extensions.
      (upstream SVN revision: 3478)
      (thanks to Matvey Kozhev <email address hidden> for the dpatch and
       investigation)
  * debian/patches/link_system_libs.dpatch:
    + Link against the Mono.Addins and FlickrNet debian packages instead of the
      bundled versions.
  * debian/patches/forward_port_to_flickrnet_2.1.5.dpatch:
    + API forward port for FlickrNet 2.1.5.
  * debian/patches/detect_sqlite2_databases.dpatch:
    + Wrote patch to detect an existing sqlite2 database during startup of
      f-spot and print out upgrade instructions.
  * debian/rules
    debian/patches/99_ltmain_as-needed.dpatch:
    + Pass --as-needed to linker for lesser dependencies.

  [ Tim Retout ]
  * New upstream version. (Closes: #436298, #446409)
  * New maintainer. (Closes: #453474)
  * Acknowledge NMUs by Margarita Manterola.
    (Closes: #435697, #427287, #401647)
  * Use dpatch to manage patches.
  * debian/watch: Update to look for 0.4.x versions, not 0.1.x.
  * debian/control:
    + Added myself to Uploaders.
    + Add build dependency on dpatch.
    + Add new Homepage field.
    + Add new Vcs-* fields.

 -- Mirco Bauer <email address hidden> Thu, 13 Dec 2007 20:57:10 +0100

Regarding Ubuntu changes:
- All changes taken from upstream SVN in 0.4.0-0ubuntu2 can be dropped - they're fixed in upstream release 0.4.1.
- Change in 0.4.0-0ubuntu3 to update translation files can be dropped - they have been updated upstream.

Therefore, the Debian release can be synced as is, rather than merged.