diff -u kvirc-4.0.0~svn3039/debian/changelog kvirc-4.0.0~svn3039/debian/changelog
--- kvirc-4.0.0~svn3039/debian/changelog
+++ kvirc-4.0.0~svn3039/debian/changelog
@@ -1,3 +1,10 @@
+kvirc (4:4.0.0~svn3039-0ubuntu2) jaunty; urgency=low
+
+  * Fix missing icon in menu (LP: #335023)
+  * Add kubuntu_02_fix_cmakelist_icons.patch and refresh 05_xpmicon.patch
+
+ -- Alessandro Ghersi <alessandro.ghersi@fastwebnet.it>  Wed, 25 Feb 2009 05:32:10 +0100
+
 kvirc (4:4.0.0~svn3039-0ubuntu1) jaunty; urgency=low
 
   * SVN pre-release (2009/01/26)
diff -u kvirc-4.0.0~svn3039/debian/patches/05_xpmicon.patch kvirc-4.0.0~svn3039/debian/patches/05_xpmicon.patch
--- kvirc-4.0.0~svn3039/debian/patches/05_xpmicon.patch
+++ kvirc-4.0.0~svn3039/debian/patches/05_xpmicon.patch
@@ -1,6 +1,23 @@
-diff -Nur kvirc/data/icons/32x32/kvirc32x32.xpm kvirc.new/data/icons/32x32/kvirc32x32.xpm
---- kvirc/data/icons/32x32/kvirc32x32.xpm	1970-01-01 01:00:00.000000000 +0100
-+++ kvirc.new/data/icons/32x32/kvirc32x32.xpm	2005-02-09 12:31:44.000000000 +0100
+Index: kvirc-4.0.0~svn3039/data/icons/32x32/CMakeLists.txt
+===================================================================
+--- kvirc-4.0.0~svn3039.orig/data/icons/32x32/CMakeLists.txt	2009-02-25 05:40:07.492560684 +0100
++++ kvirc-4.0.0~svn3039/data/icons/32x32/CMakeLists.txt	2009-02-25 05:41:22.073960940 +0100
+@@ -7,7 +7,10 @@
+ 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/32x32/)
+ 	ELSE()
+ 		# Assume linux
+-		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/)
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/)
++		# Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
++		FILE(GLOB files "*.xpm")
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
+ 	ENDIF()
+ ELSEIF(WIN32)
+ 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/)
+Index: kvirc-4.0.0~svn3039/data/icons/32x32/kvirc32x32.xpm
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ kvirc-4.0.0~svn3039/data/icons/32x32/kvirc32x32.xpm	2009-02-25 05:47:09.609573000 +0100
 @@ -0,0 +1,295 @@
 +/* XPM */
 +static char *kvirc3[] = {
@@ -297,9 +314,26 @@
 +"YXYXYXYXYXYXYXYXYXYXYXYX  % t t t u &   YXYXYXYXYXYXYXYXYXYXYXYX",
 +"YXYXYXYXYXYXYXYXYXYXYXYX    o o o o     YXYXYXYXYXYXYXYXYXYXYXYX"
 +};
-diff -Nur kvirc/data/icons/48x48/kvirc48x48.xpm kvirc.new/data/icons/48x48/kvirc48x48.xpm
---- kvirc/data/icons/48x48/kvirc48x48.xpm	1970-01-01 01:00:00.000000000 +0100
-+++ kvirc.new/data/icons/48x48/kvirc48x48.xpm	2005-02-09 12:32:20.000000000 +0100
+Index: kvirc-4.0.0~svn3039/data/icons/48x48/CMakeLists.txt
+===================================================================
+--- kvirc-4.0.0~svn3039.orig/data/icons/48x48/CMakeLists.txt	2009-02-25 05:48:23.828060270 +0100
++++ kvirc-4.0.0~svn3039/data/icons/48x48/CMakeLists.txt	2009-02-25 05:49:08.121441032 +0100
+@@ -7,7 +7,10 @@
+ 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/48x48/)
+ 	ELSE()
+ 		# Assume linux
+-		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/)
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/)
++		# Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
++		FILE(GLOB files "*.xpm")
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
+ 	ENDIF()
+ ELSEIF(WIN32)
+ 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/)
+Index: kvirc-4.0.0~svn3039/data/icons/48x48/kvirc48x48.xpm
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ kvirc-4.0.0~svn3039/data/icons/48x48/kvirc48x48.xpm	2009-02-25 05:46:39.208346945 +0100
 @@ -0,0 +1,311 @@
 +/* XPM */
 +static char *kvirc3[] = {
@@ -615,26 +648,0 @@
-diff -Nur kvirc/data/icons/32x32/CMakeLists.txt kvirc.new/data/icons/32x32/CMakeLists.txt
---- kvirc/data/icons/32x32/CMakeLists.txt	2009-01-28 11:51:40.000000000 -0330
-+++ kvirc.new/data/icons/32x32/CMakeLists.txt	2009-01-28 11:54:40.000000000 -0330
-@@ -8,6 +8,9 @@
- 	ELSE()
- 		# Assume linux
- 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/)
-+		# Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
-+		FILE(GLOB files "*.xpm")
-+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
- 	ENDIF()
- ELSEIF(WIN32)
- 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/)
-diff -Nur kvirc/data/icons/48x48/CMakeLists.txt kvirc.new/data/icons/48x48/CMakeLists.txt
---- kvirc/data/icons/48x48/CMakeLists.txt	2009-01-28 11:51:40.000000000 -0330
-+++ kvirc.new/data/icons/48x48/CMakeLists.txt	2009-01-28 11:54:40.000000000 -0330
-@@ -8,6 +8,9 @@
- 	ELSE()
- 		# Assume linux
- 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/)
-+		# Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
-+		FILE(GLOB files "*.xpm")
-+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
- 	ENDIF()
- ELSEIF(WIN32)
- 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/)
diff -u kvirc-4.0.0~svn3039/debian/patches/series kvirc-4.0.0~svn3039/debian/patches/series
--- kvirc-4.0.0~svn3039/debian/patches/series
+++ kvirc-4.0.0~svn3039/debian/patches/series
@@ -1,4 +1,5 @@
 05_xpmicon.patch
+kubuntu_02_fix_cmakelist_icons.patch
 10_gcc4.3_fix.patch
 17_awaybackaction.patch
 20_fixman.patch
only in patch2:
unchanged:
--- kvirc-4.0.0~svn3039.orig/debian/patches/kubuntu_02_fix_cmakelist_icons.patch
+++ kvirc-4.0.0~svn3039/debian/patches/kubuntu_02_fix_cmakelist_icons.patch
@@ -0,0 +1,52 @@
+Index: kvirc-4.0.0~svn3039/data/icons/128x128/CMakeLists.txt
+===================================================================
+--- kvirc-4.0.0~svn3039.orig/data/icons/128x128/CMakeLists.txt	2009-02-25 05:52:14.264060119 +0100
++++ kvirc-4.0.0~svn3039/data/icons/128x128/CMakeLists.txt	2009-02-25 05:52:25.833220274 +0100
+@@ -7,7 +7,7 @@
+ 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/128x128/)
+ 	ELSE()
+ 		# Assume linux
+-		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/)
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/)
+ 	ENDIF()
+ ELSEIF(WIN32)
+ 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/)
+Index: kvirc-4.0.0~svn3039/data/icons/16x16/CMakeLists.txt
+===================================================================
+--- kvirc-4.0.0~svn3039.orig/data/icons/16x16/CMakeLists.txt	2009-02-25 05:52:42.420060756 +0100
++++ kvirc-4.0.0~svn3039/data/icons/16x16/CMakeLists.txt	2009-02-25 05:52:52.369190670 +0100
+@@ -7,7 +7,7 @@
+ 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/16x16/)
+ 	ELSE()
+ 		# Assume linux
+-		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/)
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/)
+ 	ENDIF()
+ ELSEIF(WIN32)
+ 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/)
+Index: kvirc-4.0.0~svn3039/data/icons/64x64/CMakeLists.txt
+===================================================================
+--- kvirc-4.0.0~svn3039.orig/data/icons/64x64/CMakeLists.txt	2009-02-25 05:53:04.516061215 +0100
++++ kvirc-4.0.0~svn3039/data/icons/64x64/CMakeLists.txt	2009-02-25 05:53:16.377163736 +0100
+@@ -7,7 +7,7 @@
+ 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/64x64/)
+ 	ELSE()
+ 		# Assume linux
+-		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/)
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/)
+ 	ENDIF()
+ ELSEIF(WIN32)
+ 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/)
+Index: kvirc-4.0.0~svn3039/data/icons/scalable/CMakeLists.txt
+===================================================================
+--- kvirc-4.0.0~svn3039.orig/data/icons/scalable/CMakeLists.txt	2009-02-25 05:53:26.968060705 +0100
++++ kvirc-4.0.0~svn3039/data/icons/scalable/CMakeLists.txt	2009-02-25 05:53:38.248719305 +0100
+@@ -7,7 +7,7 @@
+ 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/scalable/)
+ 	ELSE()
+ 		# Assume linux
+-		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/)
++		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/)
+ 	ENDIF()
+ ELSEIF(WIN32)
+ 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/)