diff -u blender-2.45/debian/control blender-2.45/debian/control
--- blender-2.45/debian/control
+++ blender-2.45/debian/control
@@ -1,11 +1,12 @@
 Source: blender
 Section: graphics
 Priority: optional
-Maintainer: Debian Blender Maintainers <pkg-blender-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Blender Maintainers <pkg-blender-maintainers@lists.alioth.debian.org>
 Uploaders: Masayuki Hatta (mhatta) <mhatta@debian.org>, Florian Ernst <florian@debian.org>, Wouter van Heyst <larstiq@larstiq.dyndns.org>, Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-Build-Depends: debhelper (>= 5.0.37.2), dpatch, ftgl-dev (>= 2.0.9-1), gettext (>= 0.14.1), libgettextpo-dev, libglut-dev, libjpeg-dev, libpng-dev, libsdl-dev, libz-dev, python2.4-dev, python-central (>= 0.5), scons, libtiff4-dev, libopenexr-dev, libavformat-dev, libxi-dev, autotools-dev, pkg-config
+Build-Depends: debhelper (>= 5.0.37.2), dpatch, ftgl-dev (>= 2.0.9-1), gettext (>= 0.14.1), libgettextpo-dev, libglut-dev, libjpeg-dev, libpng-dev, libsdl-dev, libz-dev, python2.5-dev, python-central (>= 0.5), scons, libtiff4-dev, libopenexr-dev, libavformat-dev, libxi-dev, autotools-dev, pkg-config
 Build-Conflicts: nvidia-glx
-XS-Python-Version: 2.4
+XS-Python-Version: current
 Standards-Version: 3.7.2
 Homepage: http://blender.org/
 
diff -u blender-2.45/debian/patches/00list blender-2.45/debian/patches/00list
--- blender-2.45/debian/patches/00list
+++ blender-2.45/debian/patches/00list
@@ -4,0 +5 @@
+30_gameengine-libgl-location-fix
diff -u blender-2.45/debian/misc/blender-fullscreen.desktop blender-2.45/debian/misc/blender-fullscreen.desktop
--- blender-2.45/debian/misc/blender-fullscreen.desktop
+++ blender-2.45/debian/misc/blender-fullscreen.desktop
@@ -5,7 +5,7 @@
 Comment=Create and edit 3D models and animations
 Comment[ru]=Создание и редактирование трёхмерных моделей и анимаций
 Comment[fr]=Création et édition d'objets 3D et animations
-Exec=blender
+Exec=blender -W
 Icon=blender.svg
 Terminal=false
 Type=Application
diff -u blender-2.45/debian/misc/user-config.py blender-2.45/debian/misc/user-config.py
--- blender-2.45/debian/misc/user-config.py
+++ blender-2.45/debian/misc/user-config.py
@@ -1,6 +1,6 @@
 LCGDIR = './lib/linux2'
 BF_PYTHON = '/usr'
-BF_PYTHON_VERSION = '2.4'
+BF_PYTHON_VERSION = '2.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
diff -u blender-2.45/debian/changelog blender-2.45/debian/changelog
--- blender-2.45/debian/changelog
+++ blender-2.45/debian/changelog
@@ -1,3 +1,21 @@
+blender (2.45-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - LP: #164417
+    - Patches:
+      + 02_tmp_in_HOME (Debian)
+      + 04_de_po_fix (Debian)
+      + 10_gnukfreebsd_support (Debian)
+      + 30_gameengine-libgl-location-fix (Ubuntu)
+    - debian/control
+      + Set Maintainer to Ubuntu MOTU Developers
+      + Set XSBC-Original-Maintainer to Debian Blender Maintainers
+      + Build-depends: python2.5-dev instead of 2.4
+    - debian/misc/blender-fullscreen.desktop
+      + Run fullscreen with no window borders
+
+ -- Kenneth Drake <kd.drake@ou.edu>  Wed, 21 Nov 2007 18:35:32 +0000
+
 blender (2.45-1) unstable; urgency=low
 
   * New upstream release (Closes: #443278).
@@ -27,6 +45,19 @@
 
  -- Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>  Thu, 20 Sep 2007 19:14:58 +0200
 
+blender (2.44-2ubuntu2) gutsy; urgency=low
+
+  * Switch over to python 2.5 (Closes LP: #116540).
+
+ -- William Lima <wlima.amadeus@gmail.com>  Wed,  4 Jul 2007 10:57:31 -0300
+
+blender (2.44-2ubuntu1) gutsy; urgency=low
+
+  * Fix fullscreen desktop file to actually work (Closes LP: #123578)
+  * Use correct libGL SONAME (Closes LP: #113897)
+
+ -- Lukas Fittl <lfittl@ubuntu.com>  Tue, 03 Jul 2007 13:59:02 +0200
+
 blender (2.44-2) unstable; urgency=low
 
   * Added debian/patches/20_gcc4.3_support.dpatch to fix FTBFS with GCC 4.3.
@@ -625,0 +657 @@
+
only in patch2:
unchanged:
--- blender-2.45.orig/debian/patches/30_gameengine-libgl-location-fix.dpatch
+++ blender-2.45/debian/patches/30_gameengine-libgl-location-fix.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_gameengine-libgl-location-fix.dpatch by Lukas Fittl <lfittl@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad blender-2.44~/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp blender-2.44/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
+--- blender-2.44~/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp	2007-01-23 16:40:35.000000000 +0100
++++ blender-2.44/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp	2007-07-03 14:06:21.000000000 +0200
+@@ -191,7 +191,7 @@
+ 	{
+ 		if (!libGL)
+ 		{
+-			libGL = dlopen("libGL.so", RTLD_LAZY|RTLD_GLOBAL);
++			libGL = dlopen("libGL.so.1", RTLD_LAZY|RTLD_GLOBAL);
+ 			if (libGL)
+ 				bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) (dlsym(libGL, "glXGetProcAddressARB"));
+ 			else