diff -u inventor-2.1.5-10/debian/changelog inventor-2.1.5-10/debian/changelog
--- inventor-2.1.5-10/debian/changelog
+++ inventor-2.1.5-10/debian/changelog
@@ -1,3 +1,13 @@
+inventor (2.1.5-10-10ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Correct font path to /usr/share/X11/fonts/Type1.
+    - Update Build-Depends
+    - Update PROGRAM_EXT list in apps/samples/widgets/GNUmakefile
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Arthur Loiret <freacky22527@free.fr>  Mon,  4 Jun 2007 09:34:47 +0200
+
 inventor (2.1.5-10-10) unstable; urgency=low
 
   * apps/samples/widgets/componentTest.c++: Change first argument of main()
@@ -5,6 +15,13 @@
 
  -- Steve M. Robbins <smr@debian.org>  Thu, 17 May 2007 00:10:20 -0500
 
+inventor (2.1.5-10-9ubuntu1) edgy; urgency=low
+
+  * Merge from Debian unstable.
+  * Correct font path to /usr/share/X11/fonts/Type1.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Wed,  5 Jul 2006 13:55:21 +1000
+
 inventor (2.1.5-10-9) unstable; urgency=low
 
   * debian/control: Build with lesstif2 instead of lesstif1.  Closes:
@@ -39,6 +56,19 @@
 
  -- Steve M. Robbins <smr@debian.org>  Tue, 17 Jan 2006 00:38:31 -0500
 
+inventor (2.1.5-10-6ubuntu2) dapper; urgency=low
+
+  * Correct order of changelog entries.
+  * Correct C++ bug in Inventor/nodekits/SoSubKit.h. (Malone: #5733)
+
+ -- Steve Kowalik <stevenk@debian.org>  Sat,  6 May 2006 16:42:46 +1000
+
+inventor (2.1.5-10-6ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Benjamin Montgomery <bmontgom@montynet.org>  Sun, 11 Dec 2005 18:27:55 -0600
+
 inventor (2.1.5-10-6) unstable; urgency=low
 
   * debian/rules: Remove s390 from list of arches on which the
@@ -46,6 +76,17 @@
 
  -- Steve M. Robbins <smr@debian.org>  Sat, 26 Nov 2005 22:27:13 -0500
 
+inventor (2.1.5-10-5ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+    - Drop debian/patches/01_gcc4.patch.
+  * Added libgl1-mesa-swrast-dev | libgl-dev and libglu1-mesa-dev | 
+    libglu-dev to Build-Depends, and removed xlibmesa-gl-dev and 
+    libglu1-xorg-dev.
+  * Stop building componentTest, since it links against GLw.
+
+ -- Steve Kowalik <stevenk@debian.org>  Mon, 28 Nov 2005 14:09:12 +1100
+
 inventor (2.1.5-10-5) unstable; urgency=low
 
   * lib/database/include/machine.h: Add __alpha__ to list that enables
@@ -74,6 +115,13 @@
   
  -- Steve M. Robbins <smr@debian.org>  Sun,  7 Aug 2005 21:25:40 -0400
 
+inventor (2.1.5-10-3ubuntu1) breezy; urgency=low
+
+  * renaming libinventor0c102 to libinventor0
+  * fixed gcc/g++-4.0 build issues (b.d.o closes: #286471)
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sun, 05 Jun 2005 21:11:17 +0200
+
 inventor (2.1.5-10-3) unstable; urgency=low
 
   * lib/GNUmakefile: link libInventor with -ldl.  Closes: #266040.
@@ -246,0 +295 @@
+
diff -u inventor-2.1.5-10/debian/control inventor-2.1.5-10/debian/control
--- inventor-2.1.5-10/debian/control
+++ inventor-2.1.5-10/debian/control
@@ -1,9 +1,10 @@
 Source: inventor
 Section: devel
 Priority: optional
-Maintainer: Steve M. Robbins <smr@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Steve M. Robbins <smr@debian.org>
+Build-Depends: debhelper (>= 5), libx11-dev, libxi-dev, libxt-dev, x-dev, lesstif2-dev, libgl1-mesa-swrast-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libjpeg-dev, tcsh, bison
 Standards-Version: 3.6.2.0
-Build-Depends: debhelper (>= 5), libx11-dev, libxi-dev, libxt-dev, x-dev, lesstif2-dev, libgl1-mesa-swx11-dev, libglu1-xorg-dev, libfreetype6-dev, libjpeg-dev, tcsh, bison
 
 Package: libinventor0
 Conflicts: libinventor0c102
diff -u inventor-2.1.5-10/debian/link-fonts.sh inventor-2.1.5-10/debian/link-fonts.sh
--- inventor-2.1.5-10/debian/link-fonts.sh
+++ inventor-2.1.5-10/debian/link-fonts.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 fontpath=/usr/share/inventor/fonts
-type1=/usr/share/fonts/X11/Type1
+type1=/usr/share/X11/fonts/Type1
 
 mkdir -p $fontpath
 cd $fontpath
diff -u inventor-2.1.5-10/debian/rules inventor-2.1.5-10/debian/rules
--- inventor-2.1.5-10/debian/rules
+++ inventor-2.1.5-10/debian/rules
@@ -45,7 +45,6 @@
 export BUILDMAN=true
 endif
 
-
 build: build-stamp
 build-stamp:
 	dh_testdir
only in patch2:
unchanged:
--- inventor-2.1.5-10.orig/apps/samples/widgets/GNUmakefile
+++ inventor-2.1.5-10/apps/samples/widgets/GNUmakefile
@@ -1,7 +1,7 @@
 IVDEPTH = ../../..
 include $(IVDEPTH)/make/ivcommondefs
 
-PROGRAMS_EXT = libInventorWidget.a componentTest
+PROGRAMS_EXT = libInventorWidget.a
 
 all install $(COMMONTARGS):
 	for i in $(PROGRAMS_EXT); do $(MAKE) -f GNUmakefile.$$i $@; done