Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 luakit (2012.03.25-1) unstable; urgency=low
 .
   * New upstream version.
   * Make DuckDuckGo default search engine.
   * Add Debian tag to DDG query string.
Author: Clint Adams <clint@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- luakit-2012.03.25.orig/build-utils/getversion.sh
+++ luakit-2012.03.25/build-utils/getversion.sh
@@ -10,7 +10,7 @@
 #
 # This tells git to replace the format string in the following line with the
 # current short hash upon the calling of the `git archive <hash/tag>` command.
-VERSION_FROM_ARCHIVE=2f6f69c
+VERSION_FROM_ARCHIVE=a9de581
 
 # The preferred method is to use the git describe command but this is only
 # possible if the .git directory is present.
--- luakit-2012.03.25.orig/build-utils/gentokens.lua
+++ luakit-2012.03.25/build-utils/gentokens.lua
@@ -1,4 +1,4 @@
-#!/usr/bin/env lua
+#!/usr/bin/lua5.1
 
 -- build-utils/gentokens.lua - gen tokenize lib
 --
--- luakit-2012.03.25.orig/config/binds.lua
+++ luakit-2012.03.25/config/binds.lua
@@ -196,6 +196,11 @@ add_binds("normal", {
     buf("^T$",                      function (w, c) w:enter_cmd(":tabopen " .. (w.view.uri or "")) end),
     buf("^W$",                      function (w, c) w:enter_cmd(":winopen " .. (w.view.uri or "")) end),
     buf("^,g$",                     function (w, c) w:enter_cmd(":open google ") end),
+    buf("^,d$",                     function (w, c) w:enter_cmd(":open duckduckgo ") end),
+    buf("^,h$",                     function (w, c) w:enter_cmd(":open duckduckgo !hackage "
+) end),
+    buf("^,n$",                     function (w, c) w:enter_cmd(":open netflix "
+) end),
 
     -- History
     key({},          "H",           function (w, m) w:back(m.count)    end),
--- luakit-2012.03.25.orig/config/globals.lua
+++ luakit-2012.03.25/config/globals.lua
@@ -6,8 +6,9 @@ globals = {
     zoom_step           = 0.1,
     max_cmd_history     = 100,
     max_srch_history    = 100,
- -- http_proxy          = "http://example.com:3128",
+ -- proxy must now be set through proxy command; environment variable is broken
     default_window_size = "800x600",
+    term = "x-terminal-emulator",
 
  -- Disables loading of hostnames from /etc/hosts (for large host files)
  -- load_etc_hosts      = false,
@@ -53,15 +54,16 @@ soup.accept_policy = cookie_policy.alway
 search_engines = {
     luakit      = "http://luakit.org/search/index/luakit?q=%s",
     google      = "http://google.com/search?q=%s",
-    duckduckgo  = "http://duckduckgo.com/?q=%s",
+    duckduckgo  = "http://duckduckgo.com/?q=%s&t=debian",
     wikipedia   = "http://en.wikipedia.org/wiki/Special:Search?search=%s",
     debbugs     = "http://bugs.debian.org/%s",
     imdb        = "http://imdb.com/find?s=all&q=%s",
     sourceforge = "http://sf.net/search/?words=%s",
+    netflix     = "http://dvd.netflix.com/Search?v1=%s",
 }
 
 -- Set google as fallback search engine
-search_engines.default = search_engines.google
+search_engines.default = search_engines.duckduckgo
 -- Use this instead to disable auto-searching
 --search_engines.default = "%s"
 
