Please merge midori 0.1.1-1 (universe) from Debian unstable (main).

Uploaded. Thanks for your contribution Alessio. In the future, please also attach an Ubuntu->Ubuntu debdiff and your merge changelog entry to the bug report. It makes it easier to see the review and sponsor the merge. Thanks again.

This bug was fixed in the package midori - 0.1.1-1ubuntu1

---------------
midori (0.1.1-1ubuntu1) jaunty; urgency=low

  * Merge from debian unstable (LP: #311126), Ubuntu remaining changes:
    - debian/rules:
     + Added CDBS patch system support.
    - debian/postinst:
     + Changed update-alternatives priority to make midori be
       browser of last resort due to its immaturity.
    - debian/patches/01_default-homepage.patch:
     + Default homepage now is Ubuntu homepage.

midori (0.1.1-1) unstable; urgency=low

  * New upstream release. From upstream's blog post:

    * Integration of history completion in the location entry.
    * libSoup is used in place of GIO for loading icons, viewing
      sources, saving files, and for the first time icons are actually
      cached on disk.
    * The side panel gained a compact mode to take up considerably
      less space. Bookmarks in the toolbar finally match the menu and
      the panel at any time.
    * The Web Inspector [in] WebKitGtk is now supported.
    * The beginning of unit testing.
    * The ground work for an extension interface has been done,
      extension modules can be written in C at the moment. Bindings to
      Lua and/ or Python are planned for the future. Note that the
      side panel doesn't currently expose the extension management,
      but the Page holder was actually rewritten as one of the example
      extensions.

  * Change build dependency to libsoup (from gvfs and gtksourceview).
  * Rewrite manpage and package description.

 -- Alessio Treglia <email address hidden> Wed, 24 Dec 2008 10:12:32 +0100