diff -Nru texmacs-1.0.6.10/debian/changelog texmacs-1.0.6.10/debian/changelog
--- texmacs-1.0.6.10/debian/changelog	2007-06-12 12:56:32.000000000 +0200
+++ texmacs-1.0.6.10/debian/changelog	2007-06-12 12:56:34.000000000 +0200
@@ -1,3 +1,12 @@
+texmacs (1:1.0.6.10-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/patches/11-desktop-file.dpatch
+      Fix category in desktop file
+    - Update maintainer in field debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Tue, 12 Jun 2007 12:50:14 +0200
+
 texmacs (1:1.0.6.10-1) unstable; urgency=low
 
   * New upstream release. [raju]
@@ -7,6 +16,15 @@
 
  -- Atsuhito KOHDA <kohda@debian.org>  Sat, 19 May 2007 18:20:24 +0900
 
+texmacs (1:1.0.6.9-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    * debian/patches/11-desktop-file.dpatch
+      Fix category in desktop file
+    * MaintainerFieldSpec
+
+ -- Christopher James Halse Rogers (RAOF) <chalserogers@gmail.com>  Mon,  7 May 2007 11:38:03 +1000
+
 texmacs (1:1.0.6.9-4) unstable; urgency=low
 
   * Merged changelog of experimental and unstable so I hope package
@@ -60,6 +78,14 @@
 
  -- Michael Ablassmeier <abi@debian.org>  Tue,  9 Jan 2007 12:39:56 +0100
 
+texmacs (1:1.0.6-10ubuntu1) feisty; urgency=low
+
+  * Fix category in desktop file (LP: #75110)
+  * debian/control:
+    - Updated maintainer field
+
+ -- Jonh Wendell <wendell@ubuntu.com>  Mon, 26 Mar 2007 09:00:00 -0300
+
 texmacs (1:1.0.6-10) unstable; urgency=low
 
   * Integrate Patch from Andrey G. Grozin to interace with Maxima 5.10
diff -Nru texmacs-1.0.6.10/debian/control texmacs-1.0.6.10/debian/control
--- texmacs-1.0.6.10/debian/control	2007-06-12 12:56:32.000000000 +0200
+++ texmacs-1.0.6.10/debian/control	2007-06-12 12:56:34.000000000 +0200
@@ -1,7 +1,8 @@
 Source: texmacs
 Section: editors
 Priority: optional
-Maintainer: Atsuhito KOHDA <kohda@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Atsuhito KOHDA <kohda@debian.org>
 Uploaders: "Kamaraju Kusumanchi" <kamaraju@gmail.com>
 Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4), dpatch, guile-1.8-dev, libxt-dev, libx11-dev, x11proto-core-dev, libltdl3-dev, libfreetype6-dev, autotools-dev, r-base-core (>= 2.0), libimlib2-dev, netpbm, libjpeg-progs, libtiff-tools, ispell, librsvg2-bin, xfig, imagemagick
 Standards-Version: 3.7.2
diff -Nru texmacs-1.0.6.10/debian/patches/11-desktop-file.dpatch texmacs-1.0.6.10/debian/patches/11-desktop-file.dpatch
--- texmacs-1.0.6.10/debian/patches/11-desktop-file.dpatch	2007-06-12 12:56:32.000000000 +0200
+++ texmacs-1.0.6.10/debian/patches/11-desktop-file.dpatch	2007-06-12 12:56:34.000000000 +0200
@@ -27,4 +27,4 @@
 -Terminal=0
 -MapNotify=false
 +Terminal=false
-+Categories=Application;Science;Utility;
++Categories=Education;Math;Science;