diff -u snappea-3.0d3/SnapPeaPython/snappea-console snappea-3.0d3/SnapPeaPython/snappea-console
--- snappea-3.0d3/SnapPeaPython/snappea-console
+++ snappea-3.0d3/SnapPeaPython/snappea-console
@@ -3,3 +3,3 @@
 export SNAPPEA_PYTHON=/usr/share/snappea/SnapPeaPython
-export PYTHONPATH=/usr/lib/snappea:$SNAPPEA_PYTHON:$PYTHONPATH
+export PYTHONPATH=/usr/lib/snappea:$SNAPPEA_PYTHON${PYTHONPATH:+:$PYTHONPATH}
 /usr/bin/python -i $SNAPPEA_PYTHON/SnapPea.py
diff -u snappea-3.0d3/SnapPeaPython/snappea snappea-3.0d3/SnapPeaPython/snappea
--- snappea-3.0d3/SnapPeaPython/snappea
+++ snappea-3.0d3/SnapPeaPython/snappea
@@ -3,3 +3,3 @@
 export SNAPPEA_PYTHON=/usr/share/snappea/SnapPeaPython
-export PYTHONPATH=/usr/lib/snappea:$SNAPPEA_PYTHON:$PYTHONPATH
+export PYTHONPATH=/usr/lib/snappea:$SNAPPEA_PYTHON${PYTHONPATH:+:$PYTHONPATH}
 /usr/bin/python $SNAPPEA_PYTHON/SnapPeaGUI.py
diff -u snappea-3.0d3/debian/snappea.doc-base snappea-3.0d3/debian/snappea.doc-base
--- snappea-3.0d3/debian/snappea.doc-base
+++ snappea-3.0d3/debian/snappea.doc-base
@@ -2,7 +2,7 @@
 Title: SnapPea Documentation
 Author: Jeff Weeks <weeks@geometrygames.org>
 Abstract: This is the HTML documentation from the SnapPea website.
-Section: Apps/Math
+Section: Science/Mathematics
 
 Format: HTML
 Index: /usr/share/doc/snappea/SnapPeaDocs/SnapPeaGUI.html
diff -u snappea-3.0d3/debian/snappea.desktop snappea-3.0d3/debian/snappea.desktop
--- snappea-3.0d3/debian/snappea.desktop
+++ snappea-3.0d3/debian/snappea.desktop
@@ -8 +8 @@
-Categories=Math;Science;
+Categories=Math;Education;Science;
diff -u snappea-3.0d3/debian/changelog snappea-3.0d3/debian/changelog
--- snappea-3.0d3/debian/changelog
+++ snappea-3.0d3/debian/changelog
@@ -1,3 +1,22 @@
+snappea (3.0d3-20.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #688263). Remaining changes:
+    - Added .desktop.
+  * Dropped change:
+    - debian/rules: Remove dh_desktop as it is deprecated
+  * Update .desktop file for latest desktop-file-validate
+
+ -- Angel Abad <angelabad@ubuntu.com>  Thu, 09 Dec 2010 22:15:58 +0100
+
+snappea (3.0d3-20.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Set PYTHONPATH in a secure way. (Closes: #605151)
+  * Change doc-base section to Science/Mathematics.
+  * debian/control: Add ${misc:Depends}.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Thu, 02 Dec 2010 13:15:42 +0100
+
 snappea (3.0d3-20ubuntu1) hardy; urgency=low
 
   * Merge from debian unstable, remaining changes:
@@ -219 +237,0 @@
-
diff -u snappea-3.0d3/debian/control snappea-3.0d3/debian/control
--- snappea-3.0d3/debian/control
+++ snappea-3.0d3/debian/control
@@ -1,7 +1,7 @@
 Source: snappea
 Section: math
 Priority: extra
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 xSBC-Original-Maintainer: Ben Burton <bab@debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), python, python-dev, python-central (>= 0.5)
 Standards-Version: 3.7.2.1
@@ -10,7 +10,7 @@
 Package: snappea
 Architecture: any
 Section: math
-Depends: ${shlibs:Depends}, ${python:Depends}, python-pmw, python-tk
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-pmw, python-tk
 Suggests: regina-normal
 Description: a program for creating and studying hyperbolic 3-manifolds
  SnapPea is Jeff Weeks' computational tool for mathematicians working in
@@ -22,7 +22,7 @@
 Package: snappea-dev
 Architecture: any
 Section: libdevel
-Depends: snappea (= ${binary:Version}), libc6-dev
+Depends: ${misc:Depends}, snappea (= ${binary:Version}), libc6-dev
 Replaces: snappea (<< 3.0d3-10)
 Description: development files for SnapPea hyperbolic 3-manifold tool
  SnapPea is a computational tool for creating and studying hyperbolic
diff -u snappea-3.0d3/debian/rules snappea-3.0d3/debian/rules
--- snappea-3.0d3/debian/rules
+++ snappea-3.0d3/debian/rules
@@ -66,7 +66,6 @@
 	dh_installman -a
 	dh_installchangelogs -psnappea
 	dh_installchangelogs -psnappea-dev
-	dh_desktop -psnappea
 	dh_link -a
 	dh_strip -a
 	dh_compress -a