diff -u icebreaker-1.21/debian/changelog icebreaker-1.21/debian/changelog
--- icebreaker-1.21/debian/changelog
+++ icebreaker-1.21/debian/changelog
@@ -1,3 +1,11 @@
+icebreaker (1.21-10ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Fix up desktop file and install in proper location.
+  * Add xpm icon file from Aaron Whitehouse.
+
+ -- Barry deFreese <bddebian@comcast.net>  Wed,  5 Jul 2006 12:49:02 -0400
+
 icebreaker (1.21-10) unstable; urgency=low
 
   * Acknowledge NMU.  Closes: #297644
diff -u icebreaker-1.21/debian/rules icebreaker-1.21/debian/rules
--- icebreaker-1.21/debian/rules
+++ icebreaker-1.21/debian/rules
@@ -44,6 +44,11 @@
 	$(MAKE) install prefix=`pwd`/debian/icebreaker/usr highscoredir=`pwd`/debian/icebreaker/var/games
 	rm `pwd`/debian/icebreaker/var/games/icebreaker.scores
 
+	install -d debian/icebreaker/usr/share/pixmaps
+	install -d debian/icebreaker/usr/share/applications
+	install -m644 debian/icebreaker_48.xpm debian/icebreaker/usr/share/pixmaps
+	install -m644 icebreaker.desktop debian/icebreaker/usr/share/applications
+
 
 # Build architecture-independent files here.
 binary-indep: build install
only in patch2:
unchanged:
--- icebreaker-1.21.orig/icebreaker.desktop
+++ icebreaker-1.21/icebreaker.desktop
@@ -1,7 +1,10 @@
 [Desktop Entry]
+Version=1.0
 Name=IceBreaker
+GenericName=IceBreaker
 Type=Application
-Comment=%{Summary}
+Comment=Melt an iceberg into small pieces, in order to trap the penguins
 Exec=icebreaker
-Icon=/usr/share/icebreaker/icebreaker_48.bmp
-Terminal=0
+Icon=icebreaker_48
+Terminal=false
+Categories=Game;ArcadeGame;
only in patch2:
unchanged:
--- icebreaker-1.21.orig/debian/icebreaker_48.xpm
+++ icebreaker-1.21/debian/icebreaker_48.xpm
@@ -0,0 +1,121 @@
+/* XPM */
+static char * icebreaker_48_xpm[] = {
+"48 48 70 1",
+" 	c #EEEAEE",
+".	c #E2DEE2",
+"+	c #FFFAFF",
+"@	c #E2E0E2",
+"#	c #FFFEFF",
+"$	c #DEDADE",
+"%	c #F6F2F6",
+"&	c #DAD6DA",
+"*	c #6281A4",
+"=	c #004083",
+"-	c #D4D0D4",
+";	c #D4D1D4",
+">	c #D1CED1",
+",	c #CFCCCF",
+"'	c #DAD8DA",
+")	c #EEEEEE",
+"!	c #CAC8CA",
+"~	c #828282",
+"{	c #CCCACC",
+"]	c #836445",
+"^	c #A0865E",
+"/	c #7F7862",
+"(	c #666866",
+"_	c #422002",
+":	c #582F0A",
+"<	c #291E0C",
+"[	c #5A5B5A",
+"}	c #CFCDCF",
+"|	c #DEDCDE",
+"1	c #F6F6F6",
+"2	c #D5D5D5",
+"3	c #020302",
+"4	c #373635",
+"5	c #B6B6B4",
+"6	c #404042",
+"7	c #040404",
+"8	c #D5D2D5",
+"9	c #D6D2D6",
+"0	c #E6E2E6",
+"a	c #A0A0A0",
+"b	c #000100",
+"c	c #A8A8A6",
+"d	c #F9F7F2",
+"e	c #9E9D9E",
+"f	c #0C0C0C",
+"g	c #A6A4A6",
+"h	c #0A0B0A",
+"i	c #D2D0C9",
+"j	c #FFFCF6",
+"k	c #C5C4C5",
+"l	c #262826",
+"m	c #6C645C",
+"n	c #A29889",
+"o	c #D8D7D8",
+"p	c #BAB4AA",
+"q	c #6E6960",
+"r	c #FAC08F",
+"s	c #F6CC89",
+"t	c #C5BCAC",
+"u	c #F4C29A",
+"v	c #EAC285",
+"w	c #D1CFD1",
+"x	c #CDCACD",
+"y	c #622062",
+"z	c #C50041",
+"A	c #DA7798",
+"B	c #CF6C8D",
+"C	c #E6E6E6",
+"D	c #D6D4D6",
+"E	c #CDCBCD",
+"   .++++++@######$%%%%%%&      *================",
+"   .++++++@######$%%%%%%&      *================",
+"   .++++++@######$%%%%%%&      *================",
+"   .++++++@######$%%%%%%&      *================",
+"&&&-......;@@@@@@>$$$$$$,&&&&&&*================",
+"+++.++++++@######$%%%%%%'))))))*================",
+"+++.++++++@######$%%%%%%'))))))*================",
+"+++.++++++@######$%%%%%%'))))))*================",
+"+++.++++++@######$%%%%%%'))))))*================",
+"+++.++++++@###!~{$%%%%%%'))))))*================",
+"+++.++++++@###]^/$%%%%%%'))))))*================",
+"...-......;@@(_:<[$$$$$$}''''''*================",
+"   .++++++|12345678%%%%%900000090000009000000|11",
+"   .++++++|1abcdefg%%%%%900000090000009000000|11",
+"   .++++++|11hijkl%%%%%%900000090000009000000|11",
+"   .++++++|11mnopq%%%%%%900000090000009000000|11",
+"   .++++++|11rstuv%%%%%%900000090000009000000|11",
+"   .++++++|111111$%%%%%%900000090000009000000|11",
+"&&&-......w||||||>$$$$$$x999999x999999x999999w||",
+"+++&      $%%%%%%.++++++.++++++$%%%%%%$%%%%%%.++",
+"+++&      $%%%%%%.++++++.++++++$%%%%%%$%%%%%%.++",
+"+++&      $%%%%%%.++++++.++++++$%%%%%%$%%%%%%.++",
+"+++&      $%%%%%%.++++++.++++++$%%%%%%$%%%%%%.++",
+"+++&      $%%%%%%.++++++.++++++$%%%%%%$%%%%%%.++",
+"+++&      $%%%%%%.++++++.++++++$%%%%%%$%%%%%%.++",
+"...,&&&&&&>$$$$$$-......-......>$$$$$$>$$$$$$-..",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzA))@##",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzA))@##",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzA))@##",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzA))@##",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzA))@##",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzA))@##",
+"==========yzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzB'';@@",
+"CCCDCCCCCC&      $%%%%%%&      &      .++++++@##",
+"CCCDCCCCCC&      $%%%%%%&      &      .++++++@##",
+"CCCDCCCCCC&      $%%%%%%&      &      .++++++@##",
+"CCCDCCCCCC&      $%%%%%%&      &      .++++++@##",
+"CCCDCCCCCC&      $%%%%%%&      &      .++++++@##",
+"CCCDCCCCCC&      $%%%%%%&      &      .++++++@##",
+"DDDEDDDDDD,&&&&&&>$$$$$$,&&&&&&,&&&&&&-......;@@",
+"   @######&      |111111DCCCCCC9000000.++++++900",
+"   @######&      |111111DCCCCCC9000000.++++++900",
+"   @######&      |111111DCCCCCC9000000.++++++900",
+"   @######&      |111111DCCCCCC9000000.++++++900",
+"   @######&      |111111DCCCCCC9000000.++++++900",
+"   @######&      |111111DCCCCCC9000000.++++++900",
+"&&&;@@@@@@,&&&&&&w||||||EDDDDDDx999999-......x99",
+"000@######DCCCCCCDCCCCCC.++++++9000000.++++++$%%"};