diff -u cmake-2.6.0/debian/control cmake-2.6.0/debian/control
--- cmake-2.6.0/debian/control
+++ cmake-2.6.0/debian/control
@@ -28,6 +28,7 @@
 Package: cmake-gui
 Architecture: any
 Depends: cmake, ${shlibs:Depends}
+Replaces: cmake (<< 2.6.0-4ubuntu2)
 Description: GUI for cmake cross-platform make system
  CMake is used to control the software compilation process using
  simple platform and compiler independent configuration files. CMake
diff -u cmake-2.6.0/debian/rules cmake-2.6.0/debian/rules
--- cmake-2.6.0/debian/rules
+++ cmake-2.6.0/debian/rules
@@ -72,6 +72,10 @@
 	#Quick hack for cmake-gui, jriddell
 	mkdir -p debian/cmake-gui/usr/bin/
 	mv debian/cmake/usr/bin/cmake-gui debian/cmake-gui/usr/bin/
+	# fix cmake icon and menu installation
+	mkdir -p debian/cmake-gui/usr/share/pixmaps
+	mv debian/cmake/usr/share/applications debian/cmake-gui/usr/share/
+	mv debian/cmake/usr/share/pixmaps/CMakeSetup.png debian/cmake-gui/usr/share/pixmaps/
 
 # Build architecture-independent files here.
 binary-indep: build install
diff -u cmake-2.6.0/debian/changelog cmake-2.6.0/debian/changelog
--- cmake-2.6.0/debian/changelog
+++ cmake-2.6.0/debian/changelog
@@ -1,3 +1,9 @@
+cmake (2.6.0-4ubuntu2) intrepid; urgency=low
+
+  * Move cmake desktop and icon file to cmake-gui package (Closes LP: #258036)
+
+ -- Alexander Saltykov <holycheater@gmail.com>  Wed, 20 Aug 2008 18:34:00 +0600
+
 cmake (2.6.0-4ubuntu1) intrepid; urgency=low
 
   * Add libncurses5-dev build-dep, makes it build ccmake