diff -u glui-2.36/debian/changelog glui-2.36/debian/changelog
--- glui-2.36/debian/changelog
+++ glui-2.36/debian/changelog
@@ -1,3 +1,18 @@
+glui (2.36-4ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:  (LP: #488964)
+    -  Add -i to libtoolize call in debian/build/bootstrap.sh so that all files
+      are copied.
+
+ -- Charlie Smotherman <cjsmo@ubuntu.com>  Thu, 26 Nov 2009 16:03:40 -0500
+
+glui (2.36-4) unstable; urgency=low
+
+  * Update freeglut Build-Depends. Closes: #544622.
+  * Update Standards-Version to 3.8.3.
+
+ -- Bradley Smith <bradsmith@debian.org>  Wed, 02 Sep 2009 18:31:02 +0100
+
 glui (2.36-3ubuntu1) jaunty; urgency=low
 
   * Merge from debian unstable, remaining changes: LP: #313382
@@ -7,9 +22,9 @@
  -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 03 Jan 2009 10:28:35 +0530
 
 glui (2.36-3) unstable; urgency=low
- 
-   * Fix parallel builds. Closes: #506821.
- 
+
+  * Fix parallel builds. Closes: #506821.
+
  -- Bradley Smith <bradsmith@debian.org>  Tue, 25 Nov 2008 02:42:06 +0000
 
 glui (2.36-2ubuntu2) jaunty; urgency=low
@@ -123,0 +139 @@
+
diff -u glui-2.36/debian/rules glui-2.36/debian/rules
--- glui-2.36/debian/rules
+++ glui-2.36/debian/rules
@@ -50,7 +50,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-indep: build install
diff -u glui-2.36/debian/control glui-2.36/debian/control
--- glui-2.36/debian/control
+++ glui-2.36/debian/control
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Bradley Smith <bradsmith@debian.org>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), freeglut-dev, automake, libtool
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), freeglut3-dev, automake, libtool
 Homepage: http://glui.sourceforge.net/
 Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-glui.git
 Vcs-Browser: http://git.brad-smith.co.uk/?p=debian/pkg-glui.git
@@ -48,7 +48,7 @@
 Package: libglui-dev
 Architecture: any
 Section: libdevel
-Depends: libglui2c2 (= ${binary:Version}), ${misc:depends}, freeglut-dev
+Depends: libglui2c2 (= ${binary:Version}), ${misc:depends}, freeglut3-dev
 Description: A GLUT-based C++ user interface library
  GLUI provides controls such as buttons, checkboxes, radio buttons, and
  spinners to OpenGL applications.  It is window-system independent, relying