Update changelog for 0.5.11-2 release

The patch "force-ssl-cert-verification.patch" was mistakenly included
in the last Midori release; this cased a regression because the user
cannot access a website that has a self-signed SSL/TLS certificate
anymore.  This change removes the patch and allows the user to trust
self-signed certificates again.

Closes: #799337

debian/Debian-config

@@ -0,0 +1,3 @@
+[settings]
+
+homepage=file:///usr/share/doc/midori/faq.html

debian/README.Debian

@@ -0,0 +1,45 @@
+Midori for Debian
+=================
+
+Missing Icons
+-------------
+
+Based on conversation with the author, and the faq entries cited
+below, I do not think Midori will be changed upstream to use only
+"stock" GTK icons.
+
+  * There are missing icons/ warnings
+
+    The set of themed icons Midori can use is very limited. For
+    instance icons for a new tab or the throbber are not guaranteed to
+    be available. To fix this, install a Freedesktop.org spec
+    compliant icon theme, such as Tango or Gnome, or one that is
+    compatible with these.
+
+  * Tweaking Midori on the Gtk level
+
+    If you don't have a desktop application that takes care of Gtk
+    settings or if your interface doesn't support a particular
+    feature, you can modify any settings easily manually by specifying
+    them in a text file called ~/.gtkrc-2.0 or /etc/gtk-2.0/gtkrc:
+
+    Use Tango as a fallback for your icon theme:
+
+    gtk-icon-theme = "MySuperFancyTheme"
+    gtk-fallback-icon-theme = "Tango"
+
+  -- http://wiki.xfce.org/midori_faq
+
+Therefore I will add document this state of affairs in README.Debian
+and add the following header to debian/control:
+
+    Recommends: gnome-icon-theme
+
+This seems to be in line with what other packages currently do
+(e.g. galeon).
+
+I am choosing not to include a whole bunch of alternatives in the
+Recommendation because I don't want to have to keep that list of
+alternatives accurate.
+
+ -- Trent W. Buck <trentbuck@gmail.com>, Thu, 20 Nov 2008 20:23:33 +1100

debian/README.source

@@ -0,0 +1,42 @@
+I'm using the following to roll local snapshot releases.
+
+To make the initial checkout:
+
+  git clone git://git.xfce.org/kalikiana/midori midori &&
+  apt-get source midori &&
+  cd midori &&
+  zcat ../midori*.diff.gz | patch -p1
+
+To update and roll a .deb:
+
+  debuild clean &&
+  git pull &&
+  v=$(git describe --tags) && v=${v%-*} && v=${v//-/+} &&
+  dch -v $v-1 'New upstream snapshot.' &&
+  tar --exclude .git --exclude debian -lzma -cf ../${PWD##*/}_$v.orig.tar.lzma -C .. ${PWD##*/} &&
+  mkdir -p debian/source && echo '3.0 (quilt)' >debian/source/format &&
+  pdebuild
+
+Midori has a large number of optional dependencies; I have made some
+of them build dependencies based on what I think is widely useful.
+The easiest way to build your own custom binary without such support
+is to move the appropriate entries from Build-Depends to
+Build-Conflicts in debian/control.
+
+  - gtk-doc-tools: API documentation.
+  - python-docutils: HTML user documentation (from plain text).
+  - intltool: localized UI text (menu titles and such).
+  - libunique-dev: turns midori into a client/server arrangement,
+    where subsequent calls will open windows in the first midori.
+  - libsoup2.4-dev: view source code and favicons and "save as".
+  - libsqlite3-dev: persistent history.  Without this, browsing
+    history is lost when you quit midori.  Possibly also relevant for
+    bookmarks, I'm not sure.  Compiles OK with libsqlite0-dev, but
+    history isn't persistent.
+  - librsvg2-bin: create PNG icons from SVG source at compile time.
+    This avoids needing to rasterize the SVGs on the fly each time
+    midori is run.
+  - libidn11-dev: internationalized domain names.
+  - libhildon-1-dev: an alternative to GTK2, for embedded systems.
+
+ -- Trent W. Buck <trentbuck@gmail.com>, Sat, 21 Mar 2009 19:20:33 +1100

debian/TODO

@@ -0,0 +1,32 @@
+* Document how to use Firefox plugins.
+
+* Remove runtime dependency on dbus-launch.
+
+  http://www.twotoasts.de/bugs/index.php?do=details&task_id=113
+
+  When building binary packages for Debian, I can either
+
+  - Build without libunique. Then midori works for everyone, but
+    running "midori foo" on the command line results in a new midori
+    process.
+
+  - Build with libunique. Then midori doesn't start unless there is a
+    session dbus, or dbus-launch can be used to create one:
+
+    $ midori; echo $?
+
+    (midori:2128): Unique-DBus-WARNING **: Unable to open a connection
+    to the session bus: Failed to execute dbus-launch to autolaunch
+    D-Bus session
+
+    (midori:2128): Unique-DBus-WARNING **: Unable to connect to the
+    running instance, aborting.
+
+    An instance of Midori is already running but not responding.
+    1
+    $ env | grep DBUS
+    $
+
+  Neither choice particularly appeals to me. Please sort out the code
+  so that when built with libunique, midori will fall back to the
+  "unique-less" behaviour when there is no session dbus.

debian/Ubuntu-config

@@ -0,0 +1,2 @@
+[settings]
+homepage=file:///usr/share/ubuntu-artwork/home/index.html

debian/changelog

@@ -0,0 +1,626 @@
+midori (0.5.11-2) unstable; urgency=medium
+
+  * Remove "Force SSL verification" patch.
+    The patch "force-ssl-cert-verification.patch" was mistakenly included
+    in the last Midori release; this cased a regression because the user
+    cannot access a website that has a self-signed SSL/TLS certificate
+    anymore.  This change removes the patch and allows the user to trust
+    self-signed certificates again. (Closes: #799337)
+
+ -- Sergio Durigan Junior <sergiodj@sergiodj.net>  Fri, 18 Sep 2015 15:29:38 -0400
+
+midori (0.5.11-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * Apply patch from Colin Watson to improve conffile handling, using new
+    debhelper features.                                         closes: #659773
+  * debian/control:
+    - update standards version to 3.9.3.
+    - update homepage address.
+    - remove myself from uploaders.
+  * debian/midori.maintscript:
+    - handle the /etc/xdg/midori/extensions/libadblock.so removal there.
+                                                                closes: #660303
+  * debian/patches:
+    - force-ssl-cert-verification added, set ssl-strict to TRUE so connections
+      are not done if the ssl certificate can't be trusted.
+  * debian/compat bumped to 9.
+
+  [ Ryan Niebur ]
+  * new upstream version, including the waf unpack changes made thanks
+    to the NMU by Koichi Akabe
+    - refreshed patches
+    - add new Build-Dep on libzeitgeist-dev
+  * Improve dh_auto_clean target in d/rules to handle some leftover
+    files from quilt and waf
+
+  [ Andres Salomon ]
+  * Import Debian patch 0.4.3+dfsg-0.2
+
+  [ Sergio Durigan Junior ]
+  * Changing gbp.conf to not override the default tag name for releases.
+  * Updating section names on debian/gbp.conf
+  * Imported Upstream version 0.5.11
+  * Update debian/patches for the new Midori version (0.5.11).
+  * Revamp build system (use cmake instead of waf)
+    - Update debian/rules, removing old stuff (from waf) and adding new,
+      simpler rules for the cmake-based build.
+    - Update debian/control, listing the new package maintainer and
+      reviewed dependencies.
+    - Delete debian/waf-unpack file.
+    - Rename debian/config/{Debian,Ubuntu}.h files to
+      debian/config/{Debian,Ubuntu}.conf.
+    With this change, it is now unnecessary to create a DFSG-modified
+    version of the package, because Waf is not used as the build system
+    anymore (for more details, see Bug 645191).
+    It is possible to build the package now, but it still has some lintian
+    warnings that will be fixed in the following changes.
+    (Closes: #663185, #758103, #787878)
+  * Adding shlibs and lintian-overrides files.
+    Due to the way libraries (i.e., plugins) are built by Midori (without
+    a proper SONAME), it is necessary (or at least recommended) to provide
+    a shlibs file that contains trustworthy information about the
+    libraries being installed on the system.
+    Unfortunately, it is also necessary to provide a lintian-overrides
+    file in order to silence some lintian warnings (mostly about the
+    shlibs mentioned above).  We'll have to work with upstream in order to
+    solve this problem.
+    Another lintian error that needed to be silenced was related to the
+    data/midori.swf file, present at the original tarball.  This file is
+    used just for testing (i.e., it is not installed in the system), and
+    is actually generated using the png2swf utility (from the swftools
+    package), which means it can be verified.
+  * Rewrite manpage.
+    The old manpage was too simple and did not cover many of the options
+    supported by Midori on the command line.  Fixed that by rewriting it
+    almost completely, including many missing options, updating dates and
+    author, and improving the formatting.
+
+ -- Sergio Durigan Junior <sergiodj@sergiodj.net>  Tue, 15 Sep 2015 12:37:55 -0400
+
+midori (0.4.3+dfsg-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop debian/presubj.in as the webkit text browser
+    GtkLauncher is no longer packaged. (Closes: #759959)
+
+ -- Neil Williams <codehelp@debian.org>  Thu, 06 Nov 2014 14:04:07 +0000
+
+midori (0.4.3+dfsg-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Repack to extract waf script (Closes: 645191)
+  * debian/waf-unpack
+    - add to describe how to extract waf script
+  * debian/rules
+    - add get-orig-source target
+
+ -- Koichi Akabe <vbkaisetsu@gmail.com>  Sat, 24 Nov 2012 17:33:35 +0900
+
+midori (0.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 19 Dec 2011 00:26:46 +0100
+
+midori (0.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/midori.{preinst,postinst,postrm}:
+    - handle adblock configuration file rename.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 14 Nov 2011 14:26:25 +0100
+
+midori (0.4.1-2) unstable; urgency=low
+
+  * debian/control:
+    - update libwebkitgtk-dev build-dep to 1.4.3
+  * As a side effect, the rebuild against webkit 1.6.1 fix midori crashing
+    because of missing webkit_web_view_get_selected_text()      closes: #646198
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 22 Oct 2011 14:46:34 +0200
+
+midori (0.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - fix middle click on back/forward button.                  closes: #644840
+    - correctly clear private data on quit when asked.          closes: #644658
+  * debian/patches:
+    - 0001-Fix-for-Bug-819688 dropped, included upstream.
+  * debian/control:
+    - drop libjs-mootools from depends, it's not needed anymore.
+  * debian/rules:
+    - don't remove mootools.js since it's not even shipped anymore.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 10 Oct 2011 08:24:46 +0200
+
+midori (0.4.0-2) unstable; urgency=low
+
+  * debian/patches:
+    - 0001-Fix-for-Bug-819688 added, correctly restore tab panel when needed.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 06 Sep 2011 09:30:33 +0200
+
+midori (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - bump webkit build-dep to 1.1.17.
+    - bump valac build-dep to 0.10.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 02 Aug 2011 09:44:09 +0200
+
+midori (0.3.6-2) unstable; urgency=low
+
+  * debian/rules:
+    - don't install upstream changelog twice.                   closes: #614692
+  * debian/Debian-config:
+    - update homepage to point to faq.html.
+  * debian/control:
+    - build-dep on libwebkitgtk-dev instead of libwebkit-dev.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 26 Jul 2011 00:24:23 +0200
+
+midori (0.3.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - update vcs info.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 16 May 2011 08:32:33 +0200
+
+midori (0.3.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - add myself to uploaders...
+    - update standards version to 3.9.2.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 02 May 2011 21:50:53 +0200
+
+midori (0.3.3-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * debian/rules:
+    - install ChangeLog file as changelog and remove the one installed by make
+      install.
+  * debian/control:
+    - drop dpkg PreDepends.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Mar 2011 22:36:00 +0100
+
+midori (0.3.2-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+    - fix bookmarks multiplication.                             closes: #613739
+  * debian/patches:
+    - 0001-Only-no-adblock-if-main-frame-in-provisional-state dropped, included
+      upstream.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 20 Feb 2011 10:50:11 +0100
+
+midori (0.3.0-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+    - replace hardening-includes build-dep by hardening-wrapper.
+  * debian/rules:
+    - enable hardening.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 04 Feb 2011 09:01:07 +0100
+
+midori (0.3.0-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches:
+    - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix
+      adblock extension.                                        closes: #611682
+  * debian/rules:
+    - remove .lock-script in clean target.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 02 Feb 2011 21:01:25 +0100
+
+midori (0.3.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * debian/rules:
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+  * debian/rules:
+    - remove waf stuff, midori waf has been updated so it's no longer needed
+      to dynamically patch waf for HPPA.
+    - install $(DISTRO)-config to /etc/xdg/midori to tune the default homepage
+    - add -O1 to LDFLAGS.
+  * debian/{Ubuntu,Debian}-config added, with default homepage setting.
+  * debian/patches:
+    - add-debian-search refreshed.
+    - fix-serial-build dropped thanks to waf upgrade in midori.
+  * debian/control:
+    - drop quilt build-dep, useless now.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 31 Jan 2011 17:49:21 +0100
+
+midori (0.2.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [Ryan Niebur]
+  * New Upstream Version (Closes: #582213)
+    - fixes segfault (Closes: #579118)
+    - correct link to FAQ (Closes: #582512)
+  * refresh patches
+  * update copyright
+  * use dpkg-maintscript-helper to remove old config file
+    /etc/midori/extensions/libadblock.so (Closes: #573208)
+
+  [Yves-Alexis Perez]
+  * New 2.7 upstream release.
+  * debian/watch edited to correctly track upstream versions.
+  * debian/rules:
+    - use --fail-missing in dh_install
+  * debian/control:
+    - add build-dep on valac to build certain extensions.
+    - update standards version to 3.9.1
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 17 Aug 2010 22:11:21 +0200
+
+midori (0.2.4-3) unstable; urgency=low
+
+  * don't run the tests
+  * add debian/source/format
+  * fix building in Serial mode (on HPPA)
+
+ -- Ryan Niebur <ryan@debian.org>  Sun, 18 Apr 2010 23:41:50 -0700
+
+midori (0.2.4-2) unstable; urgency=low
+
+  * use a patched waf for hppa, thanks to Jakub Wilk (Closes: #559989)
+
+ -- Ryan Niebur <ryan@debian.org>  Mon, 29 Mar 2010 00:39:30 -0700
+
+midori (0.2.4-1) unstable; urgency=low
+
+  * New Upstream Version
+    - update d/copyright
+    - handles files in current dir correctly (Closes: #565329)
+  * use bundled waf again (Closes: 571709)
+  * set Standards-Version to 3.8.4
+
+ -- Ryan Niebur <ryan@debian.org>  Sun, 07 Mar 2010 22:28:54 -0800
+
+midori (0.2.2-1) unstable; urgency=low
+
+  * New Upstream Version (Closes: #556184, #558339)
+    - fixes local uri handling (Closes: #560866, #550844)
+    - move libnotify from Recommends to Build-Deps to follow upstream
+    - update debian/copyright to match upstream changes
+    - fixes handling of URLs like "some.url?%00" (Closes: #561451)
+    - running twice doesn't crash the browser (Closes: #514435)
+    - Ctrl-w on last tab now closes it but still not the browser
+      (Closes: #545251)
+    - Ctrl-u in urlbar with emacs key binding theme works (Closes: #538327)
+  * move libjs-mootools to Recommends, it's not required (Closes:
+    #547584)
+  * tell the user to report the bug against libwebkit-1.0-2 if they
+    reproduce it in the Webkit test browser. Figure out the package name
+    and the path to GtkLauncher automagically during build. (Closes:
+    #562501)
+  * switch to system waf
+    - the FTBFS #559989 is no longer the fault of anything in my package,
+      and I've set #561130 in the BTS to affect midori, so (Closes: #559989)
+  * refresh patch
+
+ -- Ryan Niebur <ryan@debian.org>  Thu, 24 Dec 2009 18:30:46 -0800
+
+midori (0.2.0-1) unstable; urgency=low
+
+  * New Upstream Version
+    (Closes: 551328, 551513)
+  * update debian/copyright
+  * bump libwebkit-dev build-dep to 1.1.15 for adblock (Closes: 546985)
+  * update my email address and remove DMUA field
+
+ -- Ryan Niebur <ryan@debian.org>  Sun, 18 Oct 2009 15:44:22 -0700
+
+midori (0.1.10-1) unstable; urgency=low
+
+  * New upstream release
+  * use mootools.js from the libjs-mootools package
+
+ -- Ryan Niebur <ryanryan52@gmail.com>  Tue, 15 Sep 2009 22:46:55 -0700
+
+midori (0.1.9-1) unstable; urgency=low
+
+  * fix watch file, thanks to Rogério Brito
+  * New Upstream Version (Closes: #541354)
+    - refresh patches
+    - update copyright
+  * fix Homepage field, thanks to Francesco Poli (Closes: #541414)
+  * improve bugs search to work for packages too, thanks to Denis
+    Laxalde for the suggestion (Closes: #542050)
+  * Debian Policy 3.8.3
+
+ -- Ryan Niebur <ryanryan52@gmail.com>  Wed, 02 Sep 2009 15:36:37 -0700
+
+midori (0.1.8-1) unstable; urgency=low
+
+  * New Upstream Version
+    - refresh patches
+    - enable tests
+    - update debian/copyright
+  * Debian Policy 3.8.2
+
+ -- Ryan Niebur <ryanryan52@gmail.com>  Sat, 01 Aug 2009 09:07:30 -0700
+
+midori (0.1.7-1) unstable; urgency=low
+
+  * New Upstream Version
+  * adopt package: set myself as maintainer, remove uploaders (Closes: #528731)
+  * rearrange the debian/rules file
+  * use xvfb for tests, but disable them, they don't work right
+  * use 'dh --with quilt' for patching instead of including
+    /usr/share/quilt/quilt.make
+  * fix format of debian/copyright
+  * build dep on debhelper 7.0.50 instead of 7.2
+  * add debian bts to the list of searches, thanks to Giuseppe for the
+    patch (Closes: #525991)
+  * refresh patches
+  * change the default-homepage patch to use the files in debian/config/
+    to set the default homepage based on whether it's debian, ubuntu,
+    etc (second half of ubuntu diff)
+  * also set a priority number for the alternative in the distro config
+    file. This sets it to 50 for debian, and 39 for ubuntu (just under
+    firefox). This addresses the other half of the ubuntu diff.
+  * add recommends on libnotify1
+  * update copyright information
+  * remove extra file, debian/patches/0001-Don-t-expressly-use-libkatze-
+    in-extensions-to-avoid.patch
+  * remove some old todo items from debian/TODO
+
+ -- Ryan Niebur <ryanryan52@gmail.com>  Fri, 29 May 2009 20:31:09 -0700
+
+midori (0.1.6-1) experimental; urgency=low
+
+  * New upstream release (Closes: #525471).
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sat, 25 Apr 2009 11:09:59 +1000
+
+midori (0.1.5-1) experimental; urgency=low
+
+  * New upstream release (Closes: #522549).
+  * Cherry-pick -fPIC fix from upstream's git and remove previous
+    kludge from debian/rules (Closes: #518281).
+  * Don't allow linking with incompatibly old libsoup (Closes: #522436).
+  * Use new "debug" section for midori-dbg.
+  * As Midori is still immature, reduce its priority as an x-www-browser
+    alternatives.  Mainly this is to keep Ubuntu's iceweasel users happy.
+
+    Long-term, I should collaborate with the other x-www-browser providers
+    to agree on a numbering system (e.g. by popcon popularity).  Currently
+    it is as follows:
+
+    20 conkeror, 30 chimera2, 50 dillo, 50 midori, 69 xlinks2,
+    70 iceweasel, 70 kazehakase, 85 epiphany-gecko, 100 konqueror,
+    100 netsurf, 120 galeon
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sun, 05 Apr 2009 14:07:42 +1000
+
+midori (0.1.4-2) experimental; urgency=low
+
+  * Always use -fPIC. (Closes: #518281).
+  * Force rebuild with newer dependencies, to see what happens.
+    The next upstream release will require these version bumps anyway.
+
+    * Bump libsoup dependency to 2.25.2.
+    * Bump webkit dependency to 1.1 (Closes: #519854, #519123).
+    * Bump libunique dependency to 1.0.6 (Closes: #509801).
+      Note that 1.0.2 should work: only 1.0.4 is bad.
+
+  * Reintroduce quilt while we wait for the 3.0 source format.
+    * Add a Debian search to the default search list (Closes: #520381).
+    * Make the homepage a local file.  See patch header for rationale.
+
+  * Use new dh 7.2 "overrides" style.
+  * Update copyright file.
+  * Remove stale CDBS dependency.
+  * Bump standards version to 3.8.1.  No changes necessary.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sat, 21 Mar 2009 21:39:05 +1100
+
+midori (0.1.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use dh(1).
+  * New dependency (libidn11-dev) and undependency (libhildon-1-dev).
+  * Install /etc/xdg/midori/search.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Mon, 09 Mar 2009 22:29:12 +1100
+
+midori (0.1.2-1) unstable; urgency=low
+
+  [ Trent W. Buck ]
+  * New upstream release (Closes: #512788).
+    Paraphrasing upstream's blog post:
+
+    * Support for bookmarklets (javascript in bookmarks).
+    * Links with target=_blank now work (opening a new tab).
+    * With recent versions of libsoup and webkit, cookies can persist
+      between sessions.
+    * Preferences or bookmarks are saved to disk as they are changed.
+    * The first time Midori is run after a crash, it will first
+      display a "rescue" dialog allowing preferences to be edited or
+      scripts disabled.  This is intended for when a script causes
+      Midori to crash as it boots, which would otherwise require
+      editing config files by hand to fix.
+     * Significant speed and capacity improvements to browsing history.
+  * Appease lintian regarding various warnings.
+  * Update feature list in Description.
+  * Make me the Maintainer and William and Uploader.
+  * Rewrite manpage.
+
+  [ William Pitcock ]
+  * Fix lintian source warnings concerning midori-dbg.
+  * Update my e-mail address.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sat, 31 Jan 2009 14:24:16 +1100
+
+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.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sat, 13 Dec 2008 18:00:06 +1100
+
+midori (0.1.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Fri, 24 Oct 2008 15:42:29 +1100
+
+midori (0.0.21+23-1) UNRELEASED; urgency=low
+
+  * Upstream snapshot.
+  * TODO: .po issue fixed upstream (FS: 114).
+  * TODO: Help > Contents now browses to FAQ (FS: 112).
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Thu, 18 Sep 2008 11:07:19 +1000
+
+midori (0.0.21-1) unstable; urgency=low
+
+  * New upstream release (Closes: #497647).
+    * control: add new upstream dependencies.
+  * control: Bump Standards-Version to 3.8.0 (no changes).  We were
+    actually already using the Homepage header field.
+  * control, compat, rules: bump debhelper to 7, because I'm a bit
+    paranoid about claiming to build with dh4.1.  Fix dh_strip args in
+    rules file since the semantics changed in dh5.
+  * README.Debian: discuss "missing" icons.
+  * control: recommend gnome-icon-theme (Closes: #494061).
+  * control: fix homepage link (Closes: #492687).
+  * control: provide www-browser (Closes: #476178).
+    Not adding www-browser alternative since other X-based browsers seem
+    to only set the x-www-browser alternative.
+  * watch: fixed.  Upstream tarballs now hosted by XFCE, yay!
+  * presubj, install: have users try GtkLauncher before reporting bugs.
+  * midori.menu: add (Closes: #466588).
+  * midori.install: install .mo and .png files!
+  * control: allow DM uploads, since I'll soon be a DM.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Mon, 15 Sep 2008 22:10:35 +1000
+
+midori (0.0.19-2) unstable; urgency=low
+
+  * Add build dependency on python (for ./waf).
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Wed, 13 Aug 2008 12:30:27 +1000
+
+midori (0.0.19-1) unstable; urgency=low
+
+  * New upstream release
+  * Upstream uses waf now.  Dirty hacks to make CDBS do waf.
+  * Drop the homepage patch, since it wasn't being unapplied correctly and
+    it doesn't really accomplish anything like the desired behaviour in
+    debian/TODO.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sun, 10 Aug 2008 22:18:52 +1000
+
+midori (0.0.18-2) unstable; urgency=low
+
+  * Change release to unstable, per William Pitcock's request.
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sun, 08 Jun 2008 13:32:23 +1000
+
+midori (0.0.18-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control (Build-Depends): accommodate name change in webkit.
+  * debian/control (Build-Depends): appease lintian by dropping -1.
+  * debian/control (Build-Depends): add libxml-parser-perl.
+  * debian/control (Homepage): add.
+  * debian/control (Maintainer, Uploaders): change (Closes: #480026).
+  * debian/copyright: appease lintian by citing copyright verbatim.
+  * debian/midori.prerm, debian/midori.postrm: tweak cases where
+    update-alternatives is called, hopefully making them more correct.
+  * debian/rules: remove config.log to appease lintian.
+  * debian/watch: add (Closes: #482002).
+
+ -- Trent W. Buck <trentbuck@gmail.com>  Sat, 07 Jun 2008 15:00:06 +1000
+
+midori (0.0.17-1) experimental; urgency=low
+
+  * New upstream release. Closes: #457392
+    - Fix issues with the preference dialog. Closes: #454206
+  * Provide an alternative for x-www-browser. Closes: #454607
+  * Update Standards-Version.
+
+ -- Emanuele Rocca <ema@debian.org>  Thu, 07 Feb 2008 11:11:14 +0100
+
+midori (0.0.13-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Emanuele Rocca <ema@debian.org>  Tue, 04 Dec 2007 19:41:39 +0100
+
+midori (0.0.12-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Emanuele Rocca <ema@debian.org>  Fri, 30 Nov 2007 18:41:48 +0100
+
+midori (0.0.11-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Emanuele Rocca <ema@debian.org>  Fri, 16 Nov 2007 18:56:50 +0100
+
+midori (0.0.10-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Emanuele Rocca <ema@debian.org>  Sat, 13 Oct 2007 10:45:09 +0200
+
+midori (0.0.8-1) experimental; urgency=low
+
+  * New upstream release
+  * Patched to build correctly against webkit 0~svn26044-1
+  * libwebkitgdk has been renamed to libwebkitgtk, build dependency updated
+    accordingly
+
+ -- Emanuele Rocca <ema@debian.org>  Tue, 09 Oct 2007 22:42:25 +0200
+
+midori (0.0.7-1) experimental; urgency=low
+
+  * New upstream release.
+  * Added minori-dbg binary package.
+  * Improved long description.
+
+ -- Emanuele Rocca <ema@debian.org>  Sat, 15 Sep 2007 14:01:58 +0200
+
+midori (0.0.6-1) experimental; urgency=low
+
+  * Initial release. Closes: #441838
+
+ -- Emanuele Rocca <ema@debian.org>  Mon, 10 Sep 2007 23:37:01 +0200

debian/clean

@@ -0,0 +1,2 @@
+midori/midori-debian.h
+debian/midori.postinst

debian/compat

@@ -0,0 +1 @@
+9

debian/config/Debian.conf

@@ -0,0 +1,2 @@
+DEBIAN_DISTRO_DEFAULT_HOMEPAGE "file:///usr/share/doc/midori/user/midori.html"
+DEBIAN_WWW_ALTERNATIVES_PRIORITY 50

debian/config/Ubuntu.conf

@@ -0,0 +1,2 @@
+DEBIAN_DISTRO_DEFAULT_HOMEPAGE "file:///usr/share/ubuntu-artwork/home/index.html"
+DEBIAN_WWW_ALTERNATIVES_PRIORITY 39

debian/control

@@ -0,0 +1,74 @@
+Source: midori
+Section: web
+Priority: optional
+Maintainer: Sergio Durigan Junior <sergiodj@sergiodj.net>
+Build-Depends: debhelper (>= 9),
+  cmake,
+  valac,
+  lsb-release,
+  libwebkitgtk-dev (>= 1.8.1),
+  libgtk2.0-dev (>= 2.24.0),
+  libglib2.0-dev,
+  libsoup-gnome2.4-dev (>= 2.27.90),
+  libxml2-dev (>= 2.6),
+  libsqlite3-dev (>= 3.6.19),
+  libjavascriptcoregtk-1.0-dev,
+  libnotify-dev,
+  libgcr-3-dev (>= 2.32),
+  librsvg2-bin,
+  intltool,
+  libunique-dev (>= 1.0.6),
+  libzeitgeist-2.0-dev,
+# Necessary for 'make check'
+  xvfb,
+  xauth,
+  xfonts-base,
+  libxss-dev
+Standards-Version: 3.9.6
+Homepage: http://www.midori-browser.org
+Vcs-Git: git://git.debian.org/collab-maint/midori.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/midori.git;a=summary
+
+Package: midori
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gnome-icon-theme
+Provides: www-browser
+# For http://bugs.debian.org/522436 (missing symbols):
+Conflicts: libsoup2.4-1 (<< 2.25.2)
+Description: fast, lightweight graphical web browser
+ Midori is a lightweight web browser based on WebKit.
+ .
+ Its features include:
+ .
+  * Full integration with GTK+2.
+  * Fast rendering with WebKit.
+  * Tabs, windows and session management.
+  * Flexibly configurable Web Search.
+  * User scripts and user styles support.
+  * Straightforward bookmark management.
+  * Customizable and extensible interface.
+  * Support for extensions (written in C).
+  * Custom context menu actions.
+
+Package: midori-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, ${misc:Depends}, midori (= ${binary:Version})
+Description: fast, lightweight graphical web browser (debug symbols)
+ Midori is a lightweight web browser based on WebKit.
+ .
+ Its features include:
+ .
+  * Full integration with GTK+2.
+  * Fast rendering with WebKit.
+  * Tabs, windows and session management.
+  * Flexibly configurable Web Search.
+  * User scripts and user styles support.
+  * Straightforward bookmark management.
+  * Customizable and extensible interface.
+  * Support for extensions (written in C).
+  * Custom context menu actions.
+ .
+ This package contains the debugging symbols for midori.

debian/copyright

@@ -0,0 +1,276 @@
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=227
+Upstream-Name: midori
+Upstream-Maintainer: Christian Dywan <christian@twotoasts.de>
+Upstream-Source: http://goodies.xfce.org/releases/midori/
+
+Files: *
+Copyright: © 2007-2010, Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: tests/magic-uri.c
+Copyright: © 2007-2009, Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
+License: LGPL-2.1+
+
+Files: midori/midori-view.c
+Copyright: Copyright (C) 2007-2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Jean-François Guchens <zcx000@gmail.com>
+License: LGPL-2.1+
+
+Files: data/speeddial-head.html
+Copyright: Copyright (C) 2009 Jean-François Guchens <zcx000@gmail.com>
+License: LGPL-2.1+
+
+Files: data/mootools.js
+Copyright: Copyright (c) 2006-2009 Valerio Proietti
+License: MIT
+
+Files: extensions/addons.c
+Copyright: Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2010 Arno Renevier <arno@renevier.net>
+License: LGPL-2.1+
+
+Files: colorful-tabs
+Copyright: Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010 Samuel Creshal <creshal@arcor.de>
+License: LGPL-2.1+
+
+Files: extensions/adblock.c
+Copyright: Copyright (C) 2009-2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
+License: LGPL-2.1+
+
+Files: extensions/cookie-manager.c extensions/cookie-manager/*
+Copyright: Copyright (C) 2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+License: LGPL-2.1+
+
+Files: extensions/feed-panel/*
+Copyright: Copyright (C) 2009-2010 Dale Whittaker <dayul@users.sf.net>
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: © 2007, Emanuele Rocca <ema@debian.org>
+ © 2008, Trent W. Buck <trentbuck@gmail.com>
+ 2009, Ryan Niebur <ryanryan52@gmail.com>
+License: expat
+
+Files: po/gl.po
+Copyright: Copyright (C) 2008, 2009 Miguel Anxo Bouzada.
+ Copyright (C) 2009-2010 Leandro Regueiro.
+License: LGPL-2.1+
+
+Files: po/sv.po
+Copyright: Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+License: LGPL-2.1+
+
+Files: katze/katze-http-cookies.c
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008 Xan Lopez <xan@gnome.org>
+ Copyright (C) 2008 Dan Winship <danw@gnome.org>
+License: LGPL-2.1+
+
+Files: katze/katze-arrayaction.c
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Enrico Tröger <enrico.troeger@uvena.de>
+License: LGPL-2.1+
+
+Files: midori/socket.c
+Copyright: Copyright 1999-2008 Hiroyuki Yamamoto
+ Copyright 2006-2009 Enrico Tröger <enrico.troeger@uvena.de>
+License: LGPL-2.1+
+
+Files: katze/katze-utils.c
+Copyright: Copyright (C) 2007-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ Copyright 2000 Red Hat, Inc.
+License: LGPL-2.1+
+
+Files: katze/katze-utils.h
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net
+License: LGPL-2.1+
+
+Files: midori/midori-browser.c
+Copyright:   Copyright (C) 2007-2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008 Dale Whittaker <dayul@users.sf.net>
+ Copyright (C) 2009 Jérôme Geulfucci <jeromeg@xfce.org>
+License: LGPL-2.1+
+
+Files: extensions/formhistory.c
+Copyright: Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
+ Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: katze/katze-preferences.c
+Copyright: Copyright (C) 2007-2009 Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: katze/katze-preferences.h
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: katze/katze-scrolled.c, katze/katze-scrolled.h
+Copyright: Copyright (C) 2007 Henrik Hedberg <hhedberg@innologies.fi>
+ Copyright (C) 2009 Nadav Wiener <nadavwr@yahoo.com>
+ Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: midori/midori-extension.c
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
+License: LGPL-2.1+
+
+Files: midori/midori-locationaction.c
+Copyright: Copyright (C) 2008-2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008-2010 Dale Whittaker <dayul@users.sf.net>
+License: LGPL-2.1+
+
+Files: midori/gtkiconentry.?
+Copyright: © 2004, Christian Hammond
+ © 2008, Cody Russell <bratsche@gnome.org>
+ (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ Modified by the GTK+ Team and others 1997-2000
+License: LGPL-2+
+
+Files: extensions/mouse-gestures.c
+Copyright: Copyright (C) 2009 Matthias Kruk <mkruk@matthiaskruk.de>
+ Copyright (C) 2009-2010 Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: extensions/status-clock.c
+Copyright: Copyright (C) 2010 Arno Renevier <arno@renevier.net>
+License: LGPL-2.1+
+
+Files: extensions/tab-switcher.c
+Copyright: Copyright (C) 2009 André Stösel <Midori-Plugin@PyIT.de>
+License: LGPL-2.1+
+
+Files: midori/midori.vapi
+Copyright: Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
+License: expat
+
+Files: tools/check-style
+Copyright: Copyright (C) 2010 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2010 Arno Renevier <arno@renevier.net>
+License: LGPL-2.1+
+
+Files: tools/midori-dev
+Copyright: Copyright (C) 2010 David Mohr <david@mcbf.net>
+License: LGPL-2.1+
+
+Files: extensions/web-cache.c
+Copyright: Copyright (C) 2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
+License: LGPL-2.1+
+
+Files: icons/scalable/extension.svg
+Copyright: © 2008, Nancy Runge <nancy@twotoasts.de>
+License: LGPL-2.1+
+
+Files: midori/sokoke.c
+Copyright: Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
+ Copyright (C) 2009 Alexander Butenko <a.butenka@gmail.com>
+ Copyright (C) 2009 Mario Sanchez Prada <msanchez@igalia.com>
+ Copyright (C) 2009 Dan Winship <danw@gnome.org>
+License: LGPL-2.1+
+
+Files: extensions/toolbar-editor.c
+Copyright: Copyright (C) 2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+License: LGPL-2.1+
+
+Files: README, TRANSLATE, INSTALL, TODO, HACKING, ChangeLog,
+ wscript, */wscript_build, docs/user/midori.css
+Copyright: © 2007, Christian Dywan <christian@twotoasts.de>
+License: expat
+
+Files: waf
+Copyright: © 2005, Thomas Nagy
+License: BSD-C3
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ See /usr/share/common-licenses/LGPL-2.1 for the full license text.
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ See /usr/share/common-licenses/LGPL-2 for the full license text.
+
+License: expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: BSD-C3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

debian/gbp.conf

@@ -0,0 +1,7 @@
+[import-orig]
+upstream-branch=upstream-unstable
+debian-branch=master
+
+[import-dsc]
+upstream-branch=upstream-unstable
+debian-branch=master

debian/midori.1

@@ -0,0 +1,123 @@
+.TH MIDORI "1" "September 2015" "midori 0.5.11" "User commands"
+
+.SH NAME
+midori \- fast and lightweight Web Browser.
+
+.SH SYNOPSIS
+
+.PP
+\fBmidori\fR [OPTION...] [URL]
+
+.SH DESCRIPTION
+\fBmidori\fR is a lightweight Web Browser.
+
+.SH OPTIONS
+.IP
+.SS "Application Options:"
+
+.TP
+\fB\-a\fR \fIADDRESS\fR\fR, \fB\-\-app\fR=\fIADDRESS\fR
+
+Run \fIADDRESS\fR as a web application.
+
+.TP
+\fB\-c\fR \fIFOLDER\fR, \fB\-\-config\fR=\fIFOLDER\fR
+
+Use \fIFOLDER\fR as configuration folder.
+
+.TP
+\fB\-p\fR, \fB\-\-private\fR
+
+Run Midori in private mode.  No changes are saved in this mode.
+
+.TP
+\fB\-\-plain\fR
+
+Plain GTK+ window with WebKit, akin to GtkLauncher.
+
+.TP
+\fB\-d\fR, \fB\-\-diagnostic\-dialog\fR
+
+Show a diagnostic dialog.
+
+.TP
+\fB\-g\fR, \fB\-\-debug\fR
+
+Run Midori within gdb and save a backtrace on crash.  Useful when
+reporting bugs against the package.
+
+.TP
+\fB\-r\fR \fIFILE\fR, \fB\-\-run\fR=\fIFILE\fR
+
+Run \fIFILE\fR as a JavaScript.
+
+.TP
+\fB\-s\fR \fIURI\fR, \fB\-\-snapshot\fR=\fIURI\fR
+
+Take a snapshot of \fIURI\fR.
+
+.TP
+\fB\-e\fR \fICOMMAND\fR, \fB\-\-execute\fR=\fICOMMAND\fR
+
+Run the specified \fICOMMAND\fR.  To obtain a list of supported
+commands, see \fB\-\-help\-execute\fR below.
+
+.TP
+\fB\-\-help\-execute\fR
+
+Print a list of available commands supported by \fB\-\-execute\fR.
+
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+
+Print the version of Midori.
+
+.TP
+\fB\-b\fR \fIPATTERN\fR, \fB\-\-block\-uris\fR=\fIPATTERN\fR
+
+Block URIs according to the regular expression specified in
+\fIPATTERN\fR.
+
+.TP
+\fB\-i\fR \fISECONDS\fR, \fB\-\-inactivity\-reset\fR=\fISECONDS\fR
+
+Reset Midori after \fISECONDS\fR seconds of inactivity.
+
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+
+X display to use.
+
+.SS Help Options:
+
+.TP
+\-?, \fB\-\-help\fR
+
+Show help options described above.
+
+.TP
+\fB\-\-help\-all\fR
+
+Show all help options.
+
+.TP
+\fB\-\-help\-gtk\fR
+
+Show GTK+ Options.
+
+.SH REPORTING BUGS
+Please report bugs using the Debian BTS <https://bugs.debian.org>.
+
+.SH AUTHOR
+\fBMidori\fR is copyright (C) 2007 Christian Dywan.
+
+.PP
+This manual page was completely rewritten by Sergio Durigan Junior
+<sergiodj@sergiodj.net>, based on the previous version by Emanuele
+Rocca <ema@debian.org>.  It was written for the Debian GNU/Linux
+system but may be used by others.
+
+.PP
+Permission is granted to copy, distribute and/or modify this document under the
+terms of the GNU General Public License, Version 2 or any later version published
+by the Free Software Foundation.

debian/midori.docs

@@ -0,0 +1,2 @@
+docs/user/*.txt
+docs/user/*.html

debian/midori.install

@@ -0,0 +1 @@
+debian/tmp/*

debian/midori.lintian-overrides

@@ -0,0 +1,37 @@
+# Overrides the warnings given by the following shlibs.  These
+# warnings are wrong because these shlibs are private to the project;
+# they are actually plugins that Midori offers.  For the rationale
+# behind these overrides, see Debian Policy, section 10.2.
+unused-shlib-entry-in-control-file libabout 1
+unused-shlib-entry-in-control-file libadblock 1
+unused-shlib-entry-in-control-file libaddons 1
+unused-shlib-entry-in-control-file libapps 1
+unused-shlib-entry-in-control-file libcolorful-tabs 1
+unused-shlib-entry-in-control-file libcookie-manager 1
+unused-shlib-entry-in-control-file libcookie-permissions 1
+unused-shlib-entry-in-control-file libcopy-tabs 1
+unused-shlib-entry-in-control-file libdelayed-load 1
+unused-shlib-entry-in-control-file libdevpet 1
+unused-shlib-entry-in-control-file libdomain-keys 1
+unused-shlib-entry-in-control-file libexternal-download-manager 1
+unused-shlib-entry-in-control-file libfeed-panel 1
+unused-shlib-entry-in-control-file libflummi 1
+unused-shlib-entry-in-control-file libformhistory 1
+unused-shlib-entry-in-control-file libhistory-list 1
+unused-shlib-entry-in-control-file libmouse-gestures 1
+unused-shlib-entry-in-control-file libnojs 1
+unused-shlib-entry-in-control-file libnotes 1
+unused-shlib-entry-in-control-file libnsplugin-manager 1
+unused-shlib-entry-in-control-file libopen-with 1
+unused-shlib-entry-in-control-file libshortcuts 1
+unused-shlib-entry-in-control-file libstatusbar-features 1
+unused-shlib-entry-in-control-file libstatus-clock 1
+unused-shlib-entry-in-control-file libtabby 1
+unused-shlib-entry-in-control-file libtab-panel 1
+unused-shlib-entry-in-control-file libtabs-minimized 1
+unused-shlib-entry-in-control-file libtoolbar-editor 1
+unused-shlib-entry-in-control-file libtransfers 1
+unused-shlib-entry-in-control-file libwebmedia-now-playing 1
+
+package-name-doesnt-match-sonames libmidori-core1
+non-dev-pkg-with-shlib-symlink usr/lib/libmidori-core.so.0.0.0 usr/lib/libmidori-core.so

debian/midori.maintscript

@@ -0,0 +1,2 @@
+mv_conffile /etc/xdg/midori/extensions/libadblock.so/config /etc/xdg/midori/extensions/adblock/config 0.4.1-2
+rm_conffile /etc/xdg/midori/extensions/libadblock.so 0.4.1-2

debian/midori.manpages

@@ -0,0 +1 @@
+debian/midori.1

debian/midori.menu

@@ -0,0 +1,2 @@
+?package(midori):needs="x11" section="Applications/Network/Web Browsing" \
+  title="Midori" command="midori"

debian/midori.postinst.base

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+case "$1" in
+    configure)
+        update-alternatives \
+            --install /usr/bin/x-www-browser \
+            x-www-browser /usr/bin/midori DEBIAN_WWW_ALTERNATIVES_PRIORITY \
+            --slave /usr/share/man/man1/x-www-browser.1.gz \
+            x-www-browser.1.gz /usr/share/man/man1/midori.1.gz
+        ;;
+esac
+#DEBHELPER#
+exit 0

debian/midori.prerm

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --remove x-www-browser /usr/bin/midori
+        ;;
+esac
+#DEBHELPER#
+exit 0

debian/midori.shlibs

@@ -0,0 +1,31 @@
+libmidori-core 1 midori
+libabout 1 midori
+libadblock 1 midori
+libaddons 1 midori
+libapps 1 midori
+libcolorful-tabs 1 midori
+libcookie-manager 1 midori
+libcookie-permissions 1 midori
+libcopy-tabs 1 midori
+libdelayed-load 1 midori
+libdevpet 1 midori
+libdomain-keys 1 midori
+libexternal-download-manager 1 midori
+libfeed-panel 1 midori
+libflummi 1 midori
+libformhistory 1 midori
+libhistory-list 1 midori
+libmouse-gestures 1 midori
+libnojs 1 midori
+libnotes 1 midori
+libnsplugin-manager 1 midori
+libopen-with 1 midori
+libshortcuts 1 midori
+libstatusbar-features 1 midori
+libstatus-clock 1 midori
+libtabby 1 midori
+libtab-panel 1 midori
+libtabs-minimized 1 midori
+libtoolbar-editor 1 midori
+libtransfers 1 midori
+libwebmedia-now-playing 1 midori

debian/patches/add-debian-searches

@@ -0,0 +1,21 @@
+Index: midori-debian-repo/config/search
+===================================================================
+--- midori-debian-repo.orig/config/search
++++ midori-debian-repo/config/search
+@@ -34,3 +34,16 @@ text=Localize text or URL
+ uri=http://translate.google.com/?q=
+ token=gt
+ 
++[Debian Packages]
++name=Debian Packages
++text=Search Debian Packages
++uri=http://packages.debian.org/%s
++icon=
++token=d
++
++[Debian Bugs]
++name=Debian Bugs
++text=Debian Bugs Search
++uri=http://bugs.debian.org/%s
++icon=
++token=dbs

debian/patches/series

@@ -0,0 +1 @@
+add-debian-searches

debian/rules

@@ -0,0 +1,57 @@
+#!/usr/bin/make -f
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# Necessary for the configuration file (xdg).
+DISTRO = $(shell lsb_release -is)
+CONFIG_FILE = debian/config/$(DISTRO).conf
+ifneq (0, $(shell test -f $(CONFIG_FILE); echo "$$?"))
+	DISTRO = Debian
+endif
+
+%:
+	dh $@ --buildsystem=cmake --builddirectory=_build/
+
+# Midori uses a "poor man's configure" which only accepts a minimal,
+# pre-defined set of flags.  Therefore, we invoke cmake directly here.
+override_dh_auto_configure:
+	dh_auto_configure -- \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+	..
+
+# cmake does not emit useful information when compiling the source
+# files.  We use VERBOSE here for that.
+override_dh_auto_build:
+	dh_auto_build -- VERBOSE=1
+
+# We have to override 'make check' because it needs to run under
+# xvfb-run.  And some tests still fail.
+override_dh_auto_test:
+	(cd _build && xvfb-run make check) || true
+
+override_dh_auto_install:
+	dh_auto_install
+	rm -f debian/tmp/usr/share/doc/midori/COPYING debian/tmp/usr/share/doc/midori/TRANSLATE
+	install -m 0644 debian/$(DISTRO)-config debian/tmp/etc/xdg/midori/config
+
+# Generate the debuginfo package.
+override_dh_strip:
+	dh_strip --dbg-package=midori-dbg
+
+# Updating the alternatives priority
+PRIORITY = $(shell sed -ne 's/^DEBIAN_WWW_ALTERNATIVES_PRIORITY \([0-9]\+\)/\1/p' $(CONFIG_FILE))
+
+debian/midori.postinst: debian/midori.postinst.base
+	sed 's/DEBIAN_WWW_ALTERNATIVES_PRIORITY/$(PRIORITY)/g' debian/midori.postinst.base > debian/midori.postinst
+
+override_dh_installdeb: debian/midori.postinst
+	dh_installdeb
+
+override_dh_installchangelogs:
+	rm -f debian/midori/usr/share/doc/midori/ChangeLog
+	dh_installchangelogs

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/lintian-overrides

@@ -0,0 +1,9 @@
+# This file is just used for testing, and is not installed with the
+# package.  Moreover, it is generated from a PNG image, using the
+# following command:
+#
+#   png2swf -z -j 1 -o data/midori.swf ./icons/16x16/midori.png
+#
+# Which means that it can be easily verified.  The png2swf command can
+# be found in the swftools package.
+midori source: source-is-missing data/midori.swf

debian/watch

@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+dfsg// \
+http://archive.xfce.org/src/apps/midori/([\d\.]+)/midori-([\d.]+).tar.bz2