diff -u gtimer-1.1.6/debian/dirs gtimer-1.1.6/debian/dirs
--- gtimer-1.1.6/debian/dirs
+++ gtimer-1.1.6/debian/dirs
@@ -3,0 +4,2 @@
+usr/share/applications
+usr/share/pixmaps
diff -u gtimer-1.1.6/debian/rules gtimer-1.1.6/debian/rules
--- gtimer-1.1.6/debian/rules
+++ gtimer-1.1.6/debian/rules
@@ -73,6 +73,8 @@
 	    $(BUILD_TREE)/AUTHORS
 	dh_installmenu
 	dh_installman $(BUILD_TREE)/gtimer.1
+	dh_install -a debian/gtimer.xpm usr/share/pixmaps/
+	dh_install -a debian/gtimer.desktop usr/share/applications/
 	dh_strip
 	dh_link
 	dh_compress -X doc/gtimer/contrib
diff -u gtimer-1.1.6/debian/control gtimer-1.1.6/debian/control
--- gtimer-1.1.6/debian/control
+++ gtimer-1.1.6/debian/control
@@ -1,7 +1,8 @@
 Source: gtimer
 Section: utils
 Priority: optional
-Maintainer: Russ Allbery <rra@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Russ Allbery <rra@debian.org>
 Build-Depends: debhelper (>> 5), dbs, gettext, libgtk1.2-dev, libglib1.2-dev,
  libxss-dev
 Standards-Version: 3.7.3
diff -u gtimer-1.1.6/debian/changelog gtimer-1.1.6/debian/changelog
--- gtimer-1.1.6/debian/changelog
+++ gtimer-1.1.6/debian/changelog
@@ -1,3 +1,11 @@
+gtimer (1.1.6-12ubuntu1) intrepid; urgency=low
+
+  * Add a .desktop file and icon (LP: #248346)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Mon, 14 Jul 2008 15:16:53 -0500
+
 gtimer (1.1.6-12) unstable; urgency=low
 
   * Fix segfault when displaying HTML reports introduced by the patch to
only in patch2:
unchanged:
--- gtimer-1.1.6.orig/debian/gtimer.xpm
+++ gtimer-1.1.6/debian/gtimer.xpm
@@ -0,0 +1,160 @@
+/* XPM */
+static char * gtimer_xpm[] = {
+"32 32 125 2",
+"  	c None",
+". 	c #19314B",
+"+ 	c #2C5480",
+"@ 	c #1D3957",
+"# 	c #4E4E4E",
+"$ 	c #000000",
+"% 	c #818181",
+"& 	c #A4A4A4",
+"* 	c #AAAAAA",
+"= 	c #9F9F9F",
+"- 	c #585858",
+"; 	c #292929",
+"> 	c #505050",
+", 	c #B1B1B1",
+"' 	c #FFFFFF",
+") 	c #787878",
+"! 	c #4A4A4A",
+"~ 	c #272727",
+"{ 	c #969696",
+"] 	c #FAFAFA",
+"^ 	c #F4F4F4",
+"/ 	c #4F4F4F",
+"( 	c #636363",
+"_ 	c #C6C6C6",
+": 	c #8E8E8E",
+"< 	c #434343",
+"[ 	c #26486E",
+"} 	c #333333",
+"| 	c #838383",
+"1 	c #2F3842",
+"2 	c #BCBCBC",
+"3 	c #E5E5E5",
+"4 	c #F0F0F0",
+"5 	c #274260",
+"6 	c #3B3B3B",
+"7 	c #A2A2A2",
+"8 	c #EAEAEA",
+"9 	c #16212E",
+"0 	c #2A4F79",
+"a 	c #1E1E1E",
+"b 	c #EDEDED",
+"c 	c #848484",
+"d 	c #171717",
+"e 	c #2E2E2E",
+"f 	c #CDCDCD",
+"g 	c #989898",
+"h 	c #14263A",
+"i 	c #454545",
+"j 	c #ACACAC",
+"k 	c #B4B4B4",
+"l 	c #192736",
+"m 	c #25466B",
+"n 	c #555555",
+"o 	c #E0E0E0",
+"p 	c #646464",
+"q 	c #5C5C5C",
+"r 	c #F6F6F6",
+"s 	c #4C4C4C",
+"t 	c #1F3B5A",
+"u 	c #284D76",
+"v 	c #363636",
+"w 	c #172D45",
+"x 	c #26496F",
+"y 	c #616161",
+"z 	c #BDBDBD",
+"A 	c #C2C2C2",
+"B 	c #7B7B7B",
+"C 	c #162B42",
+"D 	c #1D3857",
+"E 	c #686868",
+"F 	c #C4C4C4",
+"G 	c #626262",
+"H 	c #0D0D0D",
+"I 	c #6F6F6F",
+"J 	c #8A8A8A",
+"K 	c #3F4348",
+"L 	c #203954",
+"M 	c #696969",
+"N 	c #B3B3B3",
+"O 	c #676767",
+"P 	c #353535",
+"Q 	c #253950",
+"R 	c #252C34",
+"S 	c #2A2A2A",
+"T 	c #373737",
+"U 	c #202C39",
+"V 	c #203D5E",
+"W 	c #182F49",
+"X 	c #274B72",
+"Y 	c #212121",
+"Z 	c #2F3439",
+"` 	c #2D2D2D",
+" .	c #1E2C3B",
+"..	c #2C2C2C",
+"+.	c #232323",
+"@.	c #262F3A",
+"#.	c #282828",
+"$.	c #1E3044",
+"%.	c #142539",
+"&.	c #7F7F7F",
+"*.	c #DADADA",
+"=.	c #EBEBEB",
+"-.	c #565656",
+";.	c #323232",
+">.	c #0F1C2B",
+",.	c #303030",
+"'.	c #717171",
+").	c #656565",
+"!.	c #090909",
+"~.	c #3C3C3C",
+"{.	c #224264",
+"].	c #15283E",
+"^.	c #091119",
+"/.	c #393939",
+"(.	c #0F0F0F",
+"_.	c #3A3C3E",
+":.	c #212E3C",
+"<.	c #1C3653",
+"[.	c #213F61",
+"}.	c #233549",
+"|.	c #142231",
+"1.	c #0F1D2C",
+"2.	c #1E2731",
+"3.	c #2B527D",
+"4.	c #183049",
+"                                                              . ",
+"                                                            + @ ",
+"                                                          + + @ ",
+"                    # $ % & * * * = - $                 + + + @ ",
+"                ; > , ' ' ' ' ' ' ' ' ' ) !           + + + + @ ",
+"              ~ { ] ' ' ' ' ' ' ' ' ' ' ' ^ /       + + + + + @ ",
+"            ( _ ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' : < [ + + + + + @ ",
+"          } _ ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' | 1 + + + + + @ ",
+"        - 2 3 4 ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ) 5 + + + + @ ",
+"        ! ^ 6 7 ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 8 9 0 + + + @ ",
+"      a b ' c d e f ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' g h 0 + + @ ",
+"      i ' ' ] j $ e | ^ ' ' ' ' ' ' ' ' ' ' ' ' ' ' k l m + + @ ",
+"    n g ' ' ' ' o p $ q o ' ' ' ' ' ' ' ' ' ' ' ' ' r s t u + @ ",
+"    n * ' ' ' ' ' ^ q $ v , ' ' ' ' ' ' ' ' ' ' ' ' ' n w x + @ ",
+"    y z ' ' ' ' ' ' ' A e $ 7 3 ' ' ' ' ' ' ' ' ' ' ' B C D + @ ",
+"    E F ' ' ' ' ' ' ' ' f G H I ' ' ' ' ' ' ' ' ' ' ' J C D + @ ",
+"    E F ' ' ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ' ' J K L + @ ",
+"    M N ' ' ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ' ' O P Q + @ ",
+"      * ' ' ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ' ' n R D + @ ",
+"      g ' ' ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ' r s R D + @ ",
+"      S ' ' ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ' k T U V + @ ",
+"      $ b ' ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ' g a W X + @ ",
+"        ! ^ ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' 8 Y Z D 0 + @ ",
+"        - 2 ' ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' ' ) `  .m + + @ ",
+"          ..) ' ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' ' +.` R D + + + @ ",
+"            @._ ' ' ' ' ' ' $ $ ' ' ' ' ' ' ' : a #.$.m + + + @ ",
+"          + 0 %.&.*.' ' ' ' $ $ ' ' ' ' =.N -.;.R $.X + + + + @ ",
+"        + + + 0 >.,., ' ' ' '.'.' ' ' ' ).!.~.` C {.+ + + + + @ ",
+"      + + + + + 0 m ].^.'.& * * * = /.(._.R :.<.X + + + + + + @ ",
+"    + + + + + + + + u [.}.|.1.1.a 2.|. .$.D [.3.+ + + + + + + @ ",
+"  + + + + + + + + + + + + X m m m m m m + + + + + + + + + + + @ ",
+". @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ 4."};
only in patch2:
unchanged:
--- gtimer-1.1.6.orig/debian/gtimer.desktop
+++ gtimer-1.1.6/debian/gtimer.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=GTimer
+Comment=GTK-based X11 task timer
+Exec=gtimer
+Icon=gtimer
+Categories=Utility;GTK;