diff -u neverball-1.4.0/debian/neverball.install neverball-1.4.0/debian/neverball.install
--- neverball-1.4.0/debian/neverball.install
+++ neverball-1.4.0/debian/neverball.install
@@ -3,0 +4,5 @@
+debian/neverball.xpm usr/share/pixmaps
+icon/neverball.png /usr/share/pixmaps
+icon/neverputt.png /usr/share/pixmaps
+debian/neverball.desktop usr/share/applications
+debian/neverputt.desktop usr/share/applications
diff -u neverball-1.4.0/debian/rules neverball-1.4.0/debian/rules
--- neverball-1.4.0/debian/rules
+++ neverball-1.4.0/debian/rules
@@ -97,9 +97,7 @@
 	#$(MAKE) install DESTDIR=$(CURDIR)/debian/neverball
 
 	dh_install -s
-	install -d debian/neverball/usr/share/applications
-	install -m644 debian/neverball.desktop debian/neverball/usr/share/applications
-	install -m644 debian/neverputt.desktop debian/neverball/usr/share/applications
+#
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
diff -u neverball-1.4.0/debian/changelog neverball-1.4.0/debian/changelog
--- neverball-1.4.0/debian/changelog
+++ neverball-1.4.0/debian/changelog
@@ -1,3 +1,12 @@
+neverball (1.4.0-2ubuntu3) feisty; urgency=low
+
+  * Cleaned up the .desktop file installation
+  * Added neverball.xpm from Debian Bug #275649
+  * Updated the menu file to use the icon
+  * Installed the PNG icons from the upstream source
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Mon,  8 Jan 2007 20:25:01 +0900
+
 neverball (1.4.0-2ubuntu2) dapper; urgency=low
 
   * Added a neverputt .desktop to enable both binaries
diff -u neverball-1.4.0/debian/neverball.menu neverball-1.4.0/debian/neverball.menu
--- neverball-1.4.0/debian/neverball.menu
+++ neverball-1.4.0/debian/neverball.menu
@@ -2,3 +2,5 @@
-  title="Neverball" command="/usr/games/neverball"
+  title="Neverball" command="/usr/games/neverball" \
+  icon="/usr/share/pixmaps/neverball.xpm"
 ?package(neverball): needs="X11" section="Games/Arcade" \
-  title="Neverputt" command="/usr/games/neverputt"
+  title="Neverputt" command="/usr/games/neverputt" \
+  icon="/usr/share/pixmaps/neverball.xpm"
only in patch2:
unchanged:
--- neverball-1.4.0.orig/debian/neverball.xpm
+++ neverball-1.4.0/debian/neverball.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char *neverball[]={
+"32 32 20 1",
+"a c #000000",
+"o c #080c08",
+"r c #520000",
+"n c #7b7d7b",
+"# c #8b898b",
+"p c #acaeac",
+"q c #de0000",
+"b c #e6e2e6",
+"c c #ff0000",
+"k c #ff0408",
+"i c #ff0808",
+"l c #ff1c20",
+"g c #ff3c41",
+"j c #ff656a",
+"h c #ff858b",
+"f c #ff898b",
+"d c #ffb2b4",
+"m c #ffd2d5",
+"e c #ffeef6",
+". c #ffffff",
+"................................",
+"................................",
+"................................",
+"................................",
+"...........#aaaaaaaaa#..........",
+".........baacccccccccaab........",
+"........aacccccccccccccaa.......",
+".......aacccc.......ccccaa......",
+"......aaccc...........cccaa.....",
+"......accc.....ccc.....ccca.....",
+".....accc...dcccccccd...ccca....",
+".....acc...ccccccccccc...cca....",
+"....accc..eccc.....ccce..ccca...",
+"....accf..ccc.......ccc..fcca...",
+"....acc...cc...ccc...cc...cca...",
+"....acc..gcc..ccccc..ccg..cca...",
+"....acc..ccc..ccccc..ccc..cca...",
+"....acc..hcc..iccci..cch..cca...",
+"....acc...cc...jcj...cc...cca...",
+"....acck..ccc.......ccc..kcca...",
+"....accc...ccc.....ccc...ccca...",
+".....accl...ccccccccc...lcca....",
+".....accc....ccccccc....ccca....",
+"......accc......m......ccca.....",
+"......nacccc.........ccccan.....",
+".......oaccccc.....cccccao......",
+"........paqcccccccccccqap.......",
+"..........aarcccccccraa.........",
+"............aaaaaaaaa...........",
+"................................",
+"................................",
+"................................"};
only in patch2:
unchanged:
--- neverball-1.4.0.orig/debian/neverball.dirs
+++ neverball-1.4.0/debian/neverball.dirs
@@ -0,0 +1,2 @@
+/usr/share/applications
+/usr/share/pixmaps