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.09.13-r1-3) unstable; urgency=low
 .
   [ Enrico Tassi ]
   * Use post-wheezy Lua package names in Depends:
     - liblua5.1-filesystem0 -> lua5.1-filesystem
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.09.13-r1.orig/lib/introspector.lua
+++ luakit-2012.09.13-r1/lib/introspector.lua
@@ -332,15 +332,15 @@ end
 
 local source_lines = {}
 local function function_source_range(func, info)
-    local lines = source_lines[info.short_src]
+    local lines = source_lines[info.source]
 
     if not lines then
-        local source = lousy.load(info.short_src)
+        local source = lousy.load(info.source)
         lines = {}
         string.gsub(source, "([^\n]*)\n", function (line)
             table.insert(lines, line)
         end)
-        source_lines[info.short_src] = lines
+        source_lines[info.source] = lines
     end
 
     return dedent(table.concat(lines, "\n", info.linedefined,
@@ -359,12 +359,12 @@ export_funcs = {
             if mode.binds then
                 for i, b in pairs(mode.binds) do
                     local info = debug.getinfo(b.func, "uS")
-
+                    info.source = info.source:sub(2)
                     binds[i] = {
                         type = b.type,
                         key = bind_tostring(b),
                         desc = b.desc and markdown(dedent(b.desc)) or nil,
-                        filename = info.short_src,
+                        filename = info.source,
                         linedefined = info.linedefined,
                         lastlinedefined = info.lastlinedefined,
                         func = function_source_range(b.func, info),
--- luakit-2012.09.13-r1.orig/config/globals.lua
+++ luakit-2012.09.13-r1/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,
@@ -16,7 +17,11 @@ globals = {
 }
 
 -- Make useragent
-local _, arch = luakit.spawn_sync("uname -sm")
+local _, arch = luakit.spawn_sync("uname -m")
+-- If luakit doesn't start, try replacing the above line with the output of
+-- `uname -m`, such as:
+-- local arch = 'x86_64'
+
 -- Only use the luakit version if in date format (reduces identifiability)
 local lkv = string.match(luakit.version, "^(%d+.%d+.%d+)")
 globals.useragent = string.format("Mozilla/5.0 (%s) AppleWebKit/%s+ (KHTML, like Gecko) WebKitGTK+/%s luakit%s",
@@ -51,15 +56,19 @@ soup.accept_policy = cookie_policy.alway
 -- it to avoid collisions with lua's string.format characters.
 -- See: http://www.lua.org/manual/5.1/manual.html#pdf-string.format
 search_engines = {
-    duckduckgo  = "https://duckduckgo.com/?q=%s",
+    luakit      = "http://luakit.org/search/index/luakit?q=%s",
+    duckduckgo  = "http://duckduckgo.com/?q=%s&t=debian",
     github      = "https://github.com/search?q=%s",
-    google      = "https://google.com/search?q=%s",
+    google      = "http://google.com/search?q=%s",
     imdb        = "http://www.imdb.com/find?s=all&q=%s",
-    wikipedia   = "https://en.wikipedia.org/wiki/Special:Search?search=%s",
+    wikipedia   = "http://en.wikipedia.org/wiki/Special:Search?search=%s",
+    debbugs     = "http://bugs.debian.org/%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"
 
--- luakit-2012.09.13-r1.orig/config/binds.lua
+++ luakit-2012.09.13-r1/config/binds.lua
@@ -418,6 +418,16 @@ add_binds("normal", {
     key({"Control"}, "z",
         "Enter `passthrough` mode, ignores all luakit keybindings.",
         function (w) w:set_mode("passthrough") end),
+
+    -- Search engine stuff
+    buf("^,d$", "DuckDuckGo search",
+        function (w) w:enter_cmd(":open duckduckgo ") end),
+
+    buf("^,h$", "Hackage search",
+        function (w) w:enter_cmd(":open duckduckgo !hackage ") end),
+
+    buf("^,n$", "Netflix search",
+        function (w) w:enter_cmd(":open netflix ") end),
 })
 
 add_binds("insert", {
--- luakit-2012.09.13-r1.orig/build-utils/gentokens.lua
+++ luakit-2012.09.13-r1/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.09.13-r1.orig/build-utils/getversion.sh
+++ luakit-2012.09.13-r1/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=0d5f4ab
+VERSION_FROM_ARCHIVE=039e319
 
 # The preferred method is to use the git describe command but this is only
 # possible if the .git directory is present.
