diff -Nru xdotool-2.20100701.2961/debian/changelog xdotool-2.20100701.2961/debian/changelog
--- xdotool-2.20100701.2961/debian/changelog	2010-09-23 23:51:51.000000000 +0200
+++ xdotool-2.20100701.2961/debian/changelog	2012-12-31 20:07:02.000000000 +0100
@@ -1,3 +1,11 @@
+xdotool (1:2.20100701.2961-3+deb7u1) testing-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Use "require_relative" instead of "require" in t/*.rb (Thanks Salvatore
+    Bonaccorso) (Closes: #680824)
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Mon, 31 Dec 2012 20:01:41 +0100
+
 xdotool (1:2.20100701.2961-3) unstable; urgency=low
 
   * remove build-dependency on lsof by using upstream's new
diff -Nru xdotool-2.20100701.2961/debian/patches/680824-require-relative.patch xdotool-2.20100701.2961/debian/patches/680824-require-relative.patch
--- xdotool-2.20100701.2961/debian/patches/680824-require-relative.patch	1970-01-01 01:00:00.000000000 +0100
+++ xdotool-2.20100701.2961/debian/patches/680824-require-relative.patch	2012-12-31 19:41:29.000000000 +0100
@@ -0,0 +1,140 @@
+Description: Use relative_require instead of require to fix FTBFS
+Author: Michael Stapelberg <stapelberg@debian.org>
+Bug-Debian: http://bugs.debian.org/680824
+Forwarded: no
+Last-Update: 2012-12-31
+
+---
+
+--- xdotool-2.20100701.2961.orig/t/test_window.rb
++++ xdotool-2.20100701.2961/t/test_window.rb
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env ruby
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolWindowTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_typing.rb
++++ xdotool-2.20100701.2961/t/test_typing.rb
+@@ -3,7 +3,7 @@
+ 
+ require "test/unit"
+ require "tempfile"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolTypingTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_search.rb
++++ xdotool-2.20100701.2961/t/test_search.rb
+@@ -2,7 +2,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolSearchTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_mousemove.rb
++++ xdotool-2.20100701.2961/t/test_mousemove.rb
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env ruby
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolMouseMoveTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_cmd_windowsize.rb
++++ xdotool-2.20100701.2961/t/test_cmd_windowsize.rb
+@@ -3,7 +3,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolCommandWindowSizeTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_cmd_windowmove.rb
++++ xdotool-2.20100701.2961/t/test_cmd_windowmove.rb
+@@ -3,7 +3,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolCommandWindowMoveTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_cmd_windowmap.rb
++++ xdotool-2.20100701.2961/t/test_cmd_windowmap.rb
+@@ -3,7 +3,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolCommandWindowMapTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_cmd_windowfocus.rb
++++ xdotool-2.20100701.2961/t/test_cmd_windowfocus.rb
+@@ -3,7 +3,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolCommandWindowFocusTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_cmd_key.rb
++++ xdotool-2.20100701.2961/t/test_cmd_key.rb
+@@ -2,7 +2,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolCommandKeyTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_cmd_getwindowpid.rb
++++ xdotool-2.20100701.2961/t/test_cmd_getwindowpid.rb
+@@ -2,7 +2,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolCommandGetWindowPidTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_chaining.rb
++++ xdotool-2.20100701.2961/t/test_chaining.rb
+@@ -2,7 +2,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolChainingTests < Test::Unit::TestCase
+   include XdoTestHelper
+--- xdotool-2.20100701.2961.orig/t/test_basic.rb
++++ xdotool-2.20100701.2961/t/test_basic.rb
+@@ -2,7 +2,7 @@
+ #
+ 
+ require "test/unit"
+-require "xdo_test_helper"
++require_relative "xdo_test_helper"
+ 
+ class XdotoolBasicTests < Test::Unit::TestCase
+   include XdoTestHelper
diff -Nru xdotool-2.20100701.2961/debian/patches/series xdotool-2.20100701.2961/debian/patches/series
--- xdotool-2.20100701.2961/debian/patches/series	2010-09-23 23:25:39.000000000 +0200
+++ xdotool-2.20100701.2961/debian/patches/series	2012-12-31 19:40:36.000000000 +0100
@@ -1,2 +1,3 @@
 remove-build-dep-on-lsof.patch
 avoid-gnome-session-tests.patch
+680824-require-relative.patch