From 8c46d6db837a8645285f285a401186958ff420a0 Mon Sep 17 00:00:00 2001
From: Ariya Hidayat <ariya.hidayat@gmail.com>
Date: Wed, 20 Jun 2012 21:18:37 -0700
Subject: [PATCH 1/2] Only compress with UPX if it's available.

Also, make sure we use the maximum compression level.

http://code.google.com/p/phantomjs/issues/detail?id=599
---
 deploy/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/package.sh b/deploy/package.sh
index d711769e..bd1b5d3c 100755
--- a/deploy/package.sh
+++ b/deploy/package.sh
@@ -54,7 +54,7 @@ echo
 
 if [[ $OSTYPE == darwin* ]]; then
     echo -n "compressing binary..."
-    upx -qqq $dest/bin/phantomjs
+    [ ! -z upx ] && upx -qqq -9 $dest/bin/phantomjs
     echo "done"
     echo
 else

From 9c053416988da55a5a7a6d29bacca3f25207ec75 Mon Sep 17 00:00:00 2001
From: Ariya Hidayat <ariya.hidayat@gmail.com>
Date: Wed, 20 Jun 2012 21:24:30 -0700
Subject: [PATCH 2/2] Changes for Lavender.

http://code.google.com/p/phantomjs/issues/detail?id=598
---
 ChangeLog | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 188fbc7e..6ae34490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 Please see also http://code.google.com/p/phantomjs/wiki/ReleaseNotes.
 
+2012-06-20: Version 1.6.0 "Lavender"
+
+    New features
+
+      * Added support for passing arguments to WebPage's evaluate (issue 132)
+      * Added callbacks for JavaScript onConfirm and onAlert (issue 133)
+      * Added stack trace when error occurs (issue 166)
+      * Added initial support for cookies handling (issue 354)
+      * Added support for header footer when printing the page (issue 410, 512)
+      * Added headers support in the loading request (issue 452)
+      * Added support to render the web page as base64-encoded string (issue 547)
+      * Added hooks for navigation event (issue 562)
+      * Added command-line option to show debug messages (issue 575)
+      * Added support for the zoom factor for web page rendering (issue 579)
+      * Added crash reporter for Mac OS X and Linux, based on Google Breakpad (issue 576)
+      * Added 'os' object to the system module (issue 585)
+      * Added support for asynchronous evaluation (issue 593)
+
+    Improvements
+
+      * Fixed remote debugging to work on Mac OS X and Windows (issue 430)
+      * Fixed web server getting the dropped connection for empty response (issue 451)
+      * Fixed text rendered as boxes (squares) on headless Linux (issue 460)
+      * Updated Qt to version 4.8.2 (issue 495)
+      * Updated CoffeeScript compiler to version 1.3.3 (issue 496)
+      * Fixed the build script to detect and use MAKEFLAGS (issue 503)
+      * Fixed the build script to properly pass Qt config flags (issue 507)
+      * Changed Info.plist to be embedded in Mac OS X executable (issue 528)
+      * Fixed wrong module require in the imagebin example (issue 536)
+      * Fixed example scripts to exit with the right exit code (issue 544)
+      * Fixed build failure with glib 2.31.0+ (issue 559)
+      * Fixed error handler failures in some cases (issue 589)
+
 2012-03-20: Version 1.5.0 "Ghost Flower"
 
     New features