Merge lp:~midori/midori/release0.5.6 into lp:midori

[Cris Dywan]

Bump version to 0.5.6

[André Stösel (ivaldi)]

review: Approve

[lp:~midori/midori/release0.5.6]

6491. By Cris Dywan on 2013-11-20

Include wiki changes and one more merged change

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-12 21:01:59 +0000
+++ CMakeLists.txt	2013-11-20 00:14:10 +0000
@@ -11,7 +11,7 @@
 add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"")
 add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"")
 
-set(VERSION 0.5.5)
+set(VERSION 0.5.6)
 add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"")
  
 string(REPLACE "." ";" VERSION_LIST ${VERSION})

=== modified file 'ChangeLog'
--- ChangeLog	2013-08-14 17:57:02 +0000
+++ ChangeLog	2013-11-20 00:14:10 +0000
@@ -1,5 +1,102 @@
 This file is licensed under the terms of the expat license, see the file EXPAT.
 
+v0.5.6:
+ instead of creating devpet status icon on extension load, create it only to show new messages
+ Open speed dial or homepage according to preference
+ handle tab duplication
+ Add copyright note to appdata file
+ Tweak searching for resources when running from build folder
+ Swap NULL-check with main frame check
+ Use correct signal when clearing the trash
+ Hide WEbGL preference if it is unavailable
+ Remove stored popup sessions from the database
+ Check all browsers for opened sessions and whether they're popups
+ removed unused preference dialog and related code
+ Fix check for found valac and mention VALAC variable
+ Fix autoscrolling if page contains a frame with our custom error page
+ Don't use context-menu signal in WebKitGTK+ < 1.10.0
+ Fix building on Ubuntu 12.04
+ Reset item ids when re-importing bookmarks
+ Check path being NULL in export before trying to inspect it
+ restore the last closed sessions if no session is opened
+ Cast WebKitDOMHtmlElement for getting source content
+ Use font-set signal and font family for GTK+ 3.2 font chooser
+ add function to view dom source
+ remove unused variable
+ Resolve compiler warnings in current trunk
+ Update win32-release script for cmake, move unused docs/scripts to old folder
+ Try to handle previous runs of cmake in configure wrapper
+ Correct view source assertions in tab unit test
+ Build fix: found undeclared in midori_bookmarks_db_remove_item_recursive
+ Cache bookmark items to avoid their recreation on database reads
+ allow "view source" on about pages
+ Enable old target policy on cmake < 2.8.8
+ Re-arrange data file installing to be more explicit
+ option to modify the number of tabs which will be restored in each idle callback
+ Implement MidoriBookmarksDatabase class by inheritence from MidoriDatabase
+ Ensure tab spinners update as often as the menubar spinner to avoid desync
+ Use tabby sorting increment when importing session.xbel tabs
+ Only install config files to /etc if prefix equals /usr
+ handle urls as argument when starting midori
+ Make tabby compile with Webkit2
+ Drop waf build system and provide cmake-based "configure" script
+ midori_panel_action_activate_cb forgot to update the action group
+ Fixes bug where certificate Security overlay failed to close
+ handle tab movement
+ add tab sorting
+ Untangle implicit GTK+3 for Granite and WebKit2
+ Allow running test under debug tools with cmake
+ Install config files to /etc when install prefix is /usr
+ Add missing PO_FILES argument to GETTEXT_PROCESS_PO_FILES
+ Add USE_APIDOCS to build API docs with CMake
+ Rasterize SVG to PNG with rsvg-convert
+ fix bookmarks test regression after fix-1179200-4
+ Add CMakeLists.txt for config directory
+ Install mo files in locale dir
+ don't change uri/title if the tab isn't loaded
+ use a separate signal to store the tab title
+ Check if execinfo.h header exists on BSD
+ fix endless loop in Midori.Database.init
+ Use destructive-action style class in ClearPrivateData
+ Initialize priv->element to avoid crash when freeing
+ Introduces KatzeArray::update-item to handle metadata changes
+ Refactor excuting schema from file into a function
+ Use stock as string in liststore
+ Drop needless (and wrong) HAVE_LIBNOTIFY in preferences
+ Flip horizontal position of the overlay when hit by the mouse
+ Add Midori.URI.get_base_domain and use it in NoJS
+ Introduce Midori.Database and use for history and tabby
+ ctrl+shift+w should trigger a delete-event
+ Implement dialog windows opened via javascript
+ Make get_res_filename work with different hierarchies
+ fix check for new database
+ Speed up session import
+ Import tab title from old sessions
+ Separate CFLAGS for C and add missing HAVE_
+ Install top-level text files and FAQ html/ css to doc dir
+ Provide and install .appdata.xml file for app stores
+ Move bookmarks db handling to midori-bookmarks-db
+ Add XSS to OPTS_LIBRARIES
+ Update condition for UBUNTU_MENUPROXY to work on Saucy
+ Introduce tabby, the new session manager
+ Fix typo in katze_item_set_meta_integer call
+ Allow bookmark bar update on additions resulting from imports
+ Re-work midori_array_query_recursive to not include folder items twice
+ Fix syntax of icon sizes passed to foreach
+ Add bzr revision number to version if available
+ Unify nojs and cookie policy dialogs, make policy changeable within the list
+ Drop all G_ENABLE_DEBUG guards
+ Add -g to CFLAGS to enable debugging symbols
+ Adjust cmake build for Win32
+ Implement CMake build setup
+ Port MidoriApp from Unique/ sockets to GApplication
+ New signal about-content to provide content for about uris
+ Check if browser is NULL in midori_view_get_tab_menu to prevent a crash. Fixes bug #1215652.
+ Ensure proxy setting widgets callbacks don't outlive the widgets themselves
+ Fix webkit2 build error
+ Show the bookmarks import location combobox.
+ Rename internal completion URLs to avoid confusion
+
 v0.5.5:
  Fix name and text fields inversion in XBEL folder import
  Correct packing of cookie and nojs permission dialog.

=== modified file 'HACKING'
--- HACKING	2013-08-14 17:57:02 +0000
+++ HACKING	2013-11-20 00:14:10 +0000
@@ -22,38 +22,45 @@
   * https://www.bountysource.com/#trackers/130181-midori Add a bounty for a feature or bug you'd like to support
   * https://translations.launchpad.net/midori/trunk/+pots/trunk Translate to your own language
   * https://github.com/eustasy/midori-browser.org/issues Report website bugs
+  * Write tutorial your own extension - granted that's code, too, but maybe a little easier than hacking the core.
 ====== Build the code ======
 
-./waf configure --prefix=/usr
-./waf build
-sudo ./waf install
+mkdir _build
+cd _build
+cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+make
+sudo make install
+
+//Advanced Tip: Pass "-G Ninja" to cmake to use http://martine.github.io/ninja/ Ninja instead of make (usually packaged as ninja or ninja-build).//
+
+If using GTK+3 you'll want to add -DUSE_GTK3=1 to the cmake command line.
 
 Midori can be **run without being installed**.
 
-_build/default/midori/midori
+_build/midori/midori
 
 You can use a **temporary folder for testing** without affecting normal settings
 
-_build/default/midori/midori -c /tmp/midoridev
+_build/midori/midori -c /tmp/midoridev
 
 You'll want to **unit test** the code if you're testing a new version or contributed your own changes:
 
-xvfb-run ./waf check
+xvfb-run make check
 
 Automated daily builds in Launchpad (https://launchpad.net/~elementary-os/+archive/daily ppa:elementary-os/daily and https://launchpad.net/~midori/+archive/midori-dev ppa:midori/midori-dev) run these tests as well.
 ====== Debugging issues ======
 
 Testing an installed release may reveal crashers or memory corruption which require investigating from a local build and obtaining a stacktrace (backtrace, crash log).
 
-_build/default/midori/midori -g [OPTIONAL ARGUMENTS]
+_build/midori/midori -g [OPTIONAL ARGUMENTS]
 
 If the problem is a warning, not a crash GLib has a handy feature
 
-env G_DEBUG=all _build/default/midori/midori -g
+env G_DEBUG=all _build/midori/midori -g
 
 For more specific debugging output, depending on the feature in question you may use
 
-env MIDORI_DEBUG=help _build/default/midori/midori
+env MIDORI_DEBUG=help _build/midori/midori
 
 To verify a regression you might need to revert a particular change:
 
@@ -188,7 +195,7 @@
 | soup | 2.38.1 | 2.40 |
 | webkit | 1.8.3-1.fc17 | 1.10.0-0ubuntu1 |
 ====== Midori with(out) Granite ======
-When built with Granite (--enable-granite) there're a few key differences:
+When built with Granite (-DUSE_GRANITE=1 or --enable-granite) there're a few key differences:
   * Preferences uses a http://valadoc.elementaryos.org/Granite/Granite.Widgets.StaticNotebook.html Granite.Widgets.StaticNotebook
   * URL completion styling is slightly different
   * Clear Private Data uses **Granite.Widgets.LightWindow**
@@ -204,25 +211,26 @@
 yum install libsoup-devel webkitgtk3-devel sqlite-devel
 
 For cross-compilation
-yum install mingw{32,64}-webkitgtk3 mingw{32,64}-glib-networking mingw{32,64}-gdb
+yum install mingw{32,64}-webkitgtk3 mingw{32,64}-glib-networking mingw{32,64}-gdb mingw{32,64}-gstreamer-plugins-good
 
 Packages needed when assembling the archive
- yum install faenza-icon-theme p7zip mingw32-nsis
+ yum install faenza-icon-theme p7zip mingw32-nsis greybird-gtk3-theme
 
 Installing those should get you the packages needed to successfully build and develop Midori for Win32.
-
 ===== Building =====
 For 32-bit builds:
 
-mingw32-env
-./configure --enable-gtk3 --prefix=/usr/i686-w64-mingw32/sys-root/mingw/
+mkdir _mingw32
+cd _mingw32
+mingw32-cmake .. -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=/usr/i686-w64-mingw32/sys-root/mingw -DCMAKE_VERBOSE_MAKEFILE=0
 make
 sudo make install
 
 For 64-bit builds:
 
-mingw64-env
-./configure --enable-gtk3 --prefix=/usr/x86_64-w64-mingw32/sys-root/mingw/
+mkdir _mingw64
+cd _mingw64
+mingw64-cmake .. -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/sys-root/mingw -DCMAKE_VERBOSE_MAKEFILE=0
 make
 sudo make install
 
@@ -231,14 +239,13 @@
 env MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw" ./win32/makedist/makedist.midori
 64-bit build:
 env MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw/" ./win32/makedist/makedist.midori x64
-
 ===== Testing =====
 For testing your changes unfortuantely a real system is needed because Midori and WebKitGTK+ don't work properly under Wine. Even if it works some problems are not visible when using Wine, but are present when running under a real Windows system and vice versa.
 
 One way around it is to virtualize Windows on a Linux host and mount your MinGW directories as a network drive or shared folder.
 
 ====== Jargon ======
-    * freeze: the 4th week of a 4 week release cycle, bug fixes only
+    * freeze: a period of bug fixes only eg. 4/2 cycle means 4 weeks of features and 2 weeks to focus on resolving existing problems
     * MR: merge request, a branch proposed for review
     * ninja: an internal tab, usually empty label, used for taking screenshots
     * fortress: user of an ancient release like 0.4.3 as found on Raspberry Pie, Debian, Ubuntu

=== modified file 'data/faq.html'
--- data/faq.html	2013-08-14 17:57:02 +0000
+++ data/faq.html	2013-11-20 00:14:10 +0000
@@ -4,8 +4,8 @@
   <meta charset="utf-8" />
   <title>midori:faq</title>
 <meta name="generator" content="DokuWiki"/>
-<meta name="robots" content="noindex,nofollow"/>
-<meta name="date" content="2013-08-13T17:48:26+0200"/>
+<meta name="robots" content="index,follow"/>
+<meta name="date" content="2013-10-18T05:46:11+0200"/>
 <meta name="keywords" content="midori,faq"/>
 <link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki"/>
 <link rel="start" href="/"/>
@@ -169,6 +169,18 @@
 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 <abbr title="specification">spec</abbr> compliant icon theme, such as Elementary, Faenza, Buuf or GNOME.
 </p>
 
+<p>
+if you need to set a custom path for these to be “searched in” (Kiosks and embedded devices for example):
+</p>
+
+<p>
+XDG_DATA_HOME=/path/to/location  
+</p>
+
+<p>
+will add an extra path for the icons/.. directory
+</p>
+
 </div>
 
 <h4 id="tweaking_midori_on_the_gtk_level">Tweaking Midori on the Gtk level</h4>
@@ -238,7 +250,7 @@
 </p>
 
 </div>
-<!-- EDIT3 SECTION "Common problems" [1189-3545] -->
+<!-- EDIT3 SECTION "Common problems" [1189-3737] -->
 <h2 class="sectionedit4" id="security_features">Security features</h2>
 <div class="level2">
 
@@ -283,7 +295,7 @@
 </p>
 
 </div>
-<!-- EDIT4 SECTION "Security features" [3546-4763] -->
+<!-- EDIT4 SECTION "Security features" [3738-4955] -->
 <h2 class="sectionedit5" id="flash_doesn_t_work">Flash doesn&#039;t work</h2>
 <div class="level2">
 
@@ -322,9 +334,11 @@
 <p>
 nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can&#039;t crash the whole browser and Flash, which is GTK+2 can run in GTK+3.
 </p>
-<pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer nspluginwrapper
-<span class="kw2">sudo</span> nspluginwrapper <span class="re5">-i</span> <span class="sy0">/</span>usr<span class="sy0">/</span>lib<span class="sy0">/</span>flashplugin-installer<span class="sy0">/</span>libflashplayer.so
-nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span></pre>
+<pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> nspluginwrapper
+<span class="co0"># On Debian/ Ubuntu - on other systems http://get.adobe.com/de/flashplayer/</span>
+<span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer
+<span class="co0"># cd into the folder where the plugin was installed</span>
+nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span> libflashplayer.so</pre>
 
 <p>
 ~/.mozilla can also be used with Adobe&#039;s tarball if system-wide install is not an option. The approach is confirmed to work with x86-64 as well.
@@ -612,12 +626,12 @@
 </p>
 
 </div>
-<!-- EDIT5 SECTION "Flash doesn't work" [4764-13226] -->
+<!-- EDIT5 SECTION "Flash doesn't work" [4956-13512] -->
 <h1 class="sectionedit6" id="privacy">Privacy</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT6 SECTION "Privacy" [13227-13249] -->
+<!-- EDIT6 SECTION "Privacy" [13513-13535] -->
 <h2 class="sectionedit7" id="blacklist_cookies">Blacklist cookies</h2>
 <div class="level2">
 
@@ -643,7 +657,7 @@
 </p>
 
 </div>
-<!-- EDIT7 SECTION "Blacklist cookies" [13250-13786] -->
+<!-- EDIT7 SECTION "Blacklist cookies" [13536-14072] -->
 <h2 class="sectionedit8" id="adblock">Adblock</h2>
 <div class="level2">
 
@@ -652,12 +666,12 @@
 </p>
 
 </div>
-<!-- EDIT8 SECTION "Adblock" [13787-14042] -->
+<!-- EDIT8 SECTION "Adblock" [14073-14328] -->
 <h1 class="sectionedit9" id="modes">Modes</h1>
 <div class="level1">
 
 </div>
-<!-- EDIT9 SECTION "Modes" [14043-14063] -->
+<!-- EDIT9 SECTION "Modes" [14329-14349] -->
 <h2 class="sectionedit10" id="web_applications">Web Applications</h2>
 <div class="level2">
 
@@ -678,7 +692,7 @@
 </p>
 
 </div>
-<!-- EDIT10 SECTION "Web Applications" [14064-14580] -->
+<!-- EDIT10 SECTION "Web Applications" [14350-14866] -->
 <h2 class="sectionedit11" id="private_browsing">Private Browsing</h2>
 <div class="level2">
 
@@ -704,7 +718,7 @@
 </p>
 
 </div>
-<!-- EDIT11 SECTION "Private Browsing" [14581-15500] -->
+<!-- EDIT11 SECTION "Private Browsing" [14867-15786] -->
 <h2 class="sectionedit12" id="portable_modewin32">Portable mode/ Win32</h2>
 <div class="level2">
 
@@ -713,7 +727,7 @@
 </p>
 
 </div>
-<!-- EDIT12 SECTION "Portable mode/ Win32" [15501-15814] -->
+<!-- EDIT12 SECTION "Portable mode/ Win32" [15787-16100] -->
 <h2 class="sectionedit13" id="kiosk_mode">Kiosk mode</h2>
 <div class="level2">
 
@@ -745,7 +759,7 @@
 </p>
 
 </div>
-<!-- EDIT13 SECTION "Kiosk mode" [15815-16852] -->
+<!-- EDIT13 SECTION "Kiosk mode" [16101-17138] -->
 <h2 class="sectionedit14" id="always_open_midori_in_fullscreen">Always open Midori in Fullscreen</h2>
 <div class="level2">
 
@@ -778,7 +792,7 @@
 </p>
 
 </div>
-<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16853-17380] -->
+<!-- EDIT14 SECTION "Always open Midori in Fullscreen" [17139-17666] -->
 <h2 class="sectionedit15" id="overriding_settings_and_loading_extensions">Overriding settings and loading extensions</h2>
 <div class="level2">
 
@@ -795,7 +809,7 @@
 </p>
 
 </div>
-<!-- EDIT15 SECTION "Overriding settings and loading extensions" [17381-17588] -->
+<!-- EDIT15 SECTION "Overriding settings and loading extensions" [17667-17874] -->
 <h1 class="sectionedit16" id="proxy_servers">Proxy servers</h1>
 <div class="level1">
 
@@ -879,7 +893,7 @@
 </ol>
 
 </div>
-<!-- EDIT16 SECTION "Proxy servers" [17589-19410] -->
+<!-- EDIT16 SECTION "Proxy servers" [17875-19696] -->
 <h1 class="sectionedit17" id="keyboard_hotkeys">Keyboard Hotkeys</h1>
 <div class="level1">
 
@@ -961,7 +975,7 @@
 </p>
 
 </div>
-<!-- EDIT17 SECTION "Keyboard Hotkeys" [19411-20743] -->
+<!-- EDIT17 SECTION "Keyboard Hotkeys" [19697-21029] -->
 <h1 class="sectionedit18" id="mouse_gestures">Mouse Gestures</h1>
 <div class="level1">
 
@@ -995,7 +1009,7 @@
 </p>
 
 </div>
-<!-- EDIT18 SECTION "Mouse Gestures" [20744-21676] -->
+<!-- EDIT18 SECTION "Mouse Gestures" [21030-21962] -->
 <h1 class="sectionedit19" id="user_scripts_and_styles">User scripts and styles</h1>
 <div class="level1">
 
@@ -1056,7 +1070,7 @@
 </p>
 
 </div>
-<!-- EDIT19 SECTION "User scripts and styles" [21677-24231] -->
+<!-- EDIT19 SECTION "User scripts and styles" [21963-24517] -->
 <h2 class="sectionedit20" id="user_styles">User styles</h2>
 <div class="level2">
 
@@ -1102,23 +1116,23 @@
 <p>
 Customize as needed:
 </p>
-<pre class="code">a[href]:hover {
-            text-decoration: none !important;
-        }
-        a[href]:hover:after {
-            content: attr(href);
-            position: fixed; left: 4px; bottom: 4px;
-            padding: 0 6px !important;
-            max-width: 95%; overflow: hidden;
-            white-space: nowrap; text-overflow: ellipsis;
-            font:10pt sans-serif !important; text-shadow: 0 0 12px white;
-            background-color: ButtonFace !important; color: ButtonText !important;
-            opacity: 0.8; outline: ButtonFace solid thick;
-            z-index: 9999;
-        }</pre>
+<pre class="code css">a<span class="br0">&#91;</span>href<span class="br0">&#93;</span><span class="re2">:hover </span><span class="br0">&#123;</span>
+            <span class="kw1">text-decoration</span><span class="sy0">:</span> <span class="kw2">none</span> !important<span class="sy0">;</span>
+        <span class="br0">&#125;</span>
+        a<span class="br0">&#91;</span>href<span class="br0">&#93;</span><span class="re2">:hover</span><span class="re2">:after </span><span class="br0">&#123;</span>
+            <span class="kw1">content</span><span class="sy0">:</span> attr<span class="br0">&#40;</span>href<span class="br0">&#41;</span><span class="sy0">;</span>
+            <span class="kw1">position</span><span class="sy0">:</span> <span class="kw2">fixed</span><span class="sy0">;</span> <span class="kw1">left</span><span class="sy0">:</span> <span class="re3">4px</span><span class="sy0">;</span> <span class="kw1">bottom</span><span class="sy0">:</span> <span class="re3">4px</span><span class="sy0">;</span>
+            <span class="kw1">padding</span><span class="sy0">:</span> <span class="nu0">0</span> <span class="re3">6px</span> !important<span class="sy0">;</span>
+            <span class="kw1">max-width</span><span class="sy0">:</span> <span class="re3">95%</span><span class="sy0">;</span> <span class="kw1">overflow</span><span class="sy0">:</span> <span class="kw2">hidden</span><span class="sy0">;</span>
+            <span class="kw1">white-space</span><span class="sy0">:</span> <span class="kw2">nowrap</span><span class="sy0">;</span> text-overflow<span class="sy0">:</span> ellipsis<span class="sy0">;</span>
+            <span class="kw1">font</span><span class="sy0">:</span><span class="re3">10pt</span> <span class="kw2">sans-serif</span> !important<span class="sy0">;</span> <span class="kw1">text-shadow</span><span class="sy0">:</span> <span class="nu0">0</span> <span class="nu0">0</span> <span class="re3">12px</span> <span class="kw2">white</span><span class="sy0">;</span>
+            <span class="kw1">background-color</span><span class="sy0">:</span> ButtonFace !important<span class="sy0">;</span> <span class="kw1">color</span><span class="sy0">:</span> ButtonText !important<span class="sy0">;</span>
+            opacity<span class="sy0">:</span> <span class="nu0">0.8</span><span class="sy0">;</span> <span class="kw1">outline</span><span class="sy0">:</span> ButtonFace <span class="kw2">solid</span> <span class="kw2">thick</span><span class="sy0">;</span>
+            <span class="kw1">z-index</span><span class="sy0">:</span> <span class="nu0">9999</span><span class="sy0">;</span>
+        <span class="br0">&#125;</span></pre>
 
 </div>
-<!-- EDIT20 SECTION "User styles" [24232-26469] -->
+<!-- EDIT20 SECTION "User styles" [24518-26759] -->
 <h2 class="sectionedit21" id="understanding_webkit_version_numbers">Understanding WebKit Version Numbers</h2>
 <div class="level2">
 
@@ -1156,6 +1170,6 @@
 </p>
 
 </div>
-<!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [26470-] --></div>
+<!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [26760-] --></div>
 </body>
 </html>

=== modified file 'tools/release'
--- tools/release	2013-08-14 17:56:33 +0000
+++ tools/release	2013-11-20 00:14:10 +0000
@@ -9,11 +9,11 @@
 #
 # See the file COPYING for the full license text.
 
-OLDVER=$(grep --color=no 'VERSION = VERSION_FULL = ' wscript | sed -r "s@.+ = '(.+)'@\1@")
+OLDVER=$(grep -r --color=no '^set(VERSION' CMakeLists.txt | sed -r "s@.+ ([0-9.]+)\)@\1@")
 NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))")
 if [ "x$1" = "xbefore" ]; then
     echo Bumping from $OLDVER to $NEWVER
-    sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi
+    sed -i "s@$OLDVER@$NEWVER@g" CMakeLists.txt win32/makedist/midori.nsi
     echo; echo v$NEWVER:; bzr log --line -rtag:$OLDVER.. | sed -r 's@.+2013-[0-9]+-[0-9]+ @@' | sed 's@\[merge\] @@' | grep -v -E 'l10n|makedist|tools(/release)?: |nsi|translation|Bump version to|Merge lp:midori|POTFILES.in'; echo
     curl http://wiki.xfce.org/_export/raw/midori/contribute | \
         sed -r 's@\[\[([^|]+)\|([^]]+)\]\]@\1 \2@g' | \
@@ -22,6 +22,7 @@
         sed 's@This is a list of frequently asked questions@This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a>@g' | \
         sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html
 elif [ "x$1" = "xafter" ]; then
+    NEWVER=$OLDVER
     echo -n bzr commit -p -m "'Bump version to $NEWVER'"
     case $SHELL in
     *fish*)

=== modified file 'win32/makedist/midori.nsi'
--- win32/makedist/midori.nsi	2013-11-19 19:55:28 +0000
+++ win32/makedist/midori.nsi	2013-11-20 00:14:10 +0000
@@ -21,7 +21,7 @@
 ; helper defines  ;
 ;;;;;;;;;;;;;;;;;;;
 !define PRODUCT_NAME "Midori"
-!define PRODUCT_VERSION "0.5.5"
+!define PRODUCT_VERSION "0.5.6"
 !define PRODUCT_BUILD "0"
 !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}"
 !define PRODUCT_PUBLISHER "Christian Dywan"