Please sync zim 0.26-2 (universe) from Debian unstable (main).

[Alessio Treglia]

Binary package hint: zim

Please sync zim 0.26-2 (universe) from Debian unstable (main).

Explanation of the Ubuntu delta and why it can be dropped:
scrot has been added to Recommends field.

Changelog since current jaunty version 0.25-1ubuntu1:

zim (0.26-2) unstable; urgency=low

  * Add scrot to Recommends, it's used by the Insert Screenshot plugin.
    Taken from Ubuntu (LP: #267534) where the change was made by Alessio
    Treglia <email address hidden> (unfortunately without reporting the
    problem to the Debian BTS).

 -- Raphael Hertzog <email address hidden> Wed, 08 Oct 2008 09:27:34 +0200

zim (0.26-1) unstable; urgency=low

  * New upstream version:
    * Added translations for Finnish, Turkish and Simplified Chinese
    * Added integrated version control support for zim notebooks based on
      Bazaar. Added "Save Version" (<Ctrl><Shift>S) and "Versions" dialog
      to File menu.
    * Zim text files now have headers with content type and time stamps
    * Changed wiki syntax for Verbatim blocks, now allows non-verbatim
      paragaphs and bullet lists to be indented - lp #208986
    * Added mimetype for zim text files text/x-zim-wiki
    * Changed mimetype for .zim files to application/x-zim-notebook
    * Added special notebook for man pages with "--man" commandline option
    * Added support for reading gjots2(1) files; added application/x-gjots
      mimetype
    * Made auto incrementing a numbered list optional - lp #235020
      Closes: #482449
    * Added translation support for plural forms - lp #226976
    * Fixed bugs for perl 5.10 - lp #235030, #242490
      Closes: #482797
    * Fixed bug in Calendar plugin when namespace is read-only
    * Fixed bug in ToggleReadOnly plugin when first page is read-only
    * Fixed bug with TrayIcon for single notebook mode - lp #252712
    * Fixed bug that prevented typing under win32 - lp #252005
  * Improved the description. Closes: #493618
  * Add Suggests: bzr, subversion as both can be used in combination with
    Zim.
  * Standards-Version upgraded to 3.8.0 (no change needed).
  * Updated debian/rules to adjust for move of the Subversion.pl plugin.

 -- Raphael Hertzog <email address hidden> Tue, 02 Sep 2008 16:23:39 +0200

[Devid Antonio Filoni (d.filoni)]

ACK from me.

[Martin Pitt (pitti)]

[Updating] zim (0.25-1ubuntu1 [Ubuntu] < 0.26-2 [Debian])
 * Trying to add zim...
  - <zim_0.26-2.dsc: downloading from http://ftp.debian.org/debian/>
  - <zim_0.26-2.diff.gz: downloading from http://ftp.debian.org/debian/>
  - <zim_0.26.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
I: zim [universe] -> zim_0.25-1ubuntu1 [universe].