diff -u octave3.0-3.0.1/debian/changelog octave3.0-3.0.1/debian/changelog
--- octave3.0-3.0.1/debian/changelog
+++ octave3.0-3.0.1/debian/changelog
@@ -1,3 +1,12 @@
+octave3.0 (1:3.0.1-6ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #257305):
+    - Add patches/51_fix_desktop_entry.dpatch
+      + Modify octave desktop entry to appear in Education menu.
+    - Add 51_fix_desktop_entry to in/octave3.0-00list.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Tue, 12 Aug 2008 09:24:52 -0500
+
 octave3.0 (1:3.0.1-6) unstable; urgency=low
 
   * debian/in/PACKAGE-info.postinst: Remove the info entries for octave2.9
@@ -47,6 +56,16 @@
 
  -- Thomas Weber <thomas.weber.mail@gmail.com>  Sat, 24 May 2008 13:49:51 +0200
 
+octave3.0 (1:3.0.1-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #226673), remaining changes:
+    - Fix in/octave3.0-00list.
+    - patches/51_fix_desktop_entry.dpatch: Fix octave desktop entry to 
+      appear in Education menu.
+    - Set maintainer to Ubuntu MOTU Team.
+
+ -- Luis Medinas <lmedinas@gmail.com>  Tue, 20 May 2008 04:40:20 +0100
+
 octave3.0 (1:3.0.1-3) unstable; urgency=low
 
   [ Rafael Laboissiere ]
@@ -133,6 +152,19 @@
 
  -- Rafael Laboissiere <rafael@debian.org>  Thu, 06 Mar 2008 15:28:08 +0100
 
+octave3.0 (1:3.0.0-9ubuntu1) hardy; urgency=low
+
+  * Fixed octave's desktop entry, so it appears in the Education 
+    menu together with the other math packages such as Euler and Kig
+    (LP: #209701). The fix is applied as a patch. 
+    Files affected: 
+     - debian/control (maintainer-munge)
+     - debian/changelog
+     - patches/51_fix_desktop_entry.dpatch (new file)
+     - patches/00list
+  
+ -- Morten Kjeldgaard <mok@bioxray.au.dk>  Mon, 31 Mar 2008 15:43:17 +0200
+
 octave3.0 (1:3.0.0-9) unstable; urgency=low
 
   * debian/in/control: drop gfortran-4.1 from the build-deps list. It doesn't
@@ -2868,0 +2901 @@
+
diff -u octave3.0-3.0.1/debian/control octave3.0-3.0.1/debian/control
--- octave3.0-3.0.1/debian/control
+++ octave3.0-3.0.1/debian/control
@@ -1,8 +1,8 @@
-
 Source: octave3.0
 Section: math
 Priority: optional
-Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael@debian.org>,
  Thomas Weber <thomas.weber.mail@gmail.com>
 DM-Upload-Allowed: yes
diff -u octave3.0-3.0.1/debian/in/octave3.0-00list octave3.0-3.0.1/debian/in/octave3.0-00list
--- octave3.0-3.0.1/debian/in/octave3.0-00list
+++ octave3.0-3.0.1/debian/in/octave3.0-00list
@@ -1,6 +1,7 @@
 50_octave-bug-tempfile
 50_include-cstring-mxarray
 50_fix_handle_for_plotyy.dpatch
+51_fix_desktop_entry
 50_add_syspath.dpatch
 randn_doc.dpatch
 no_pdf_in_print.dpatch
only in patch2:
unchanged:
--- octave3.0-3.0.1.orig/debian/patches/51_fix_desktop_entry.dpatch
+++ octave3.0-3.0.1/debian/patches/51_fix_desktop_entry.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_fix_desktop_entry.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
+##
+## DP: fix octave's desktop entry, so it appears in the Education 
+## DP: menu together with the other math packages such as euler and kig.
+
+
+@DPATCH@
+diff -urNad octave3.0-3.0.0~/examples/octave.desktop.in octave3.0-3.0.0/examples/octave.desktop.in
+--- octave3.0-3.0.0~/examples/octave.desktop.in	2006-07-19 08:18:12.000000000 +0200
++++ octave3.0-3.0.0/examples/octave.desktop.in	2008-03-31 15:36:01.000000000 +0200
+@@ -7,5 +6,5 @@
+ Icon=%OCTAVE_IMAGEDIR%/octave-sombrero.png
+ Terminal=true
+ Type=Application
+-Categories=Development;Math;Science;
++Categories=Education;Science;Math;
+ StartupNotify=false