diff -u g3data-1.5.3/debian/control g3data-1.5.3/debian/control
--- g3data-1.5.3/debian/control
+++ g3data-1.5.3/debian/control
@@ -1,8 +1,9 @@
 Source: g3data
 Section: science
 Priority: optional
-Maintainer: Peter S Galbraith <psg@debian.org>
-Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, docbook-to-man
+XSBC-Original-Maintainer: Peter S Galbraith <psg@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, docbook-to-man, sharutils
 Standards-Version: 3.7.2
 
 Package: g3data
diff -u g3data-1.5.3/debian/rules g3data-1.5.3/debian/rules
--- g3data-1.5.3/debian/rules
+++ g3data-1.5.3/debian/rules
@@ -38,6 +38,8 @@
 	dh_installdirs usr/bin
 	# Add here commands to install the package into debian/g3data.
 	install -m 755 g3data debian/g3data/usr/bin
+	mkdir -p debian/g3data/usr/share/pixmaps/
+	uudecode -o debian/g3data.png debian/g3data.png.uue
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -58,6 +60,8 @@
 #	dh_installinit
 #	dh_installcron
 	dh_installman g3data.1.gz
+	dh_install debian/g3data.desktop usr/share/applications
+	dh_install debian/g3data.png usr/share/pixmaps
 #	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs 
diff -u g3data-1.5.3/debian/changelog g3data-1.5.3/debian/changelog
--- g3data-1.5.3/debian/changelog
+++ g3data-1.5.3/debian/changelog
@@ -1,3 +1,11 @@
+g3data (1:1.5.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #380841
+    - Added desktop file and icon
+    - Added commands to debian/rules to uudecode and install the icon
+    - Added sharutils to build-dep
+ -- Ilya Barygin <conscious@mail.ru>  Wed, 27 May 2009 10:10:12 +0400
+
 g3data (1:1.5.3-1) unstable; urgency=low
 
   * New upstream release. "please package new upstream version (1.5.3)",
@@ -7,6 +15,27 @@
 
  -- Peter S Galbraith <psg@debian.org>  Thu, 14 May 2009 22:11:08 -0400
 
+g3data (1:1.5.1-1ubuntu2) gutsy; urgency=low
+
+  * debian/control:
+    - Added sharutils to build-dep
+  * Added debian/g3data.png.uue for Icon (LP: #94987)
+  * debian/rules:
+    - Added commands to uudecode g3data.png.uue and install it into
+      /usr/share/pixmaps
+  * debian/g3data.desktop:
+    - Cleaning up .desktop file to match the standards
+      (Thx to Andrea Veri)
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat, 15 Sep 2007 14:03:46 +0200
+
+g3data (1:1.5.1-1ubuntu1) gutsy; urgency=low
+
+  * Re-merge with Debian
+    * Re-add desktop file from Phill Bull (Closes Malone: #36374)
+
+ -- Barry deFreese <bddebian@comcast.net>  Tue,  1 May 2007 12:15:20 -0400
+
 g3data (1:1.5.1-1) unstable; urgency=low
 
   * New upstream release
@@ -100,0 +130 @@
+
only in patch2:
unchanged:
--- g3data-1.5.3.orig/debian/g3data.png.uue
+++ g3data-1.5.3/debian/g3data.png.uue
@@ -0,0 +1,35 @@
+begin 644 g3data.png
+MB5!.1PT*&@H````-24A$4@```#`````P"`0```#]"S$,`````7-21T(`KLX<
+MZ0````)B2T=$`/^'C\R_````"7!(67,```L3```+$P$`FIP8````!W1)344'
+MUPD/#``;%>/$F```!15)1$%46,/MV,UO5.<5!O#?O3/C;QML_($)8(+KXAAH
+M6M-&%(&BT%91B-1*J=IN$K7IHEUVV6VD_@_M*FH5M5VT2M12%D5%0HKC-'P$
+M@RAQ%3L$#!A,QF`\'G_-Q^TBE_&U8T=@JZI4938SNIKW?<YYS_,\Y[PW$/FO
+M?D*^`/@?`Z0WLCB(OR/!FEQ)KW?K&FU:U`H$"J9,RBFL`K,N@"I/ZM.F:%[!
+M9MTZ31ART4<6/Q-*]/BG>L#S)EQPV[22>ON\ZJAI9_W)VW(;S6"'E^WQ9S/N
+M6D3>H`9/Z[-=EWI_,Y?X=\IKC[=]RB$_T:?7EV2-*Z-DT=?TJ-&FVA5W-Y)!
+MVE:M-FGRA-NNR((I-RVJ4N>K^EQ.G/MCZR`R9Q&!>FTR\=.2O!)"=39+;41H
+M!<.&S%@P85B^PI50@))94TJ/<D1!'._#WR'QPF&OF]#ADN-F8B+6VR8C4G35
+MA\N(F5Y-0LTVJQ?*R\F:UZA/MP7GC2F:<\K[ZMWW0(1(M?WVRECT;V\:70:P
+M0@=5NAVVVQVWT*'+3<-:?-USJAWW&S>7G6THM$F_5QQ5]"]O.6%B[0PR#OJQ
+M0RXZ;EBDVS-><ML%LSJT>];?W1*A09<Z@2:=]NJWS3GO&/"!W`KEII/U[O4S
+M+XJ,&/9`8-2(8W9@P,<"U]P7(5!KFR:A>ENUJE604J=)K9FU`:H<<423K/N*
+M(I&"G)*T/<YZ79.+1N/23QJ0$DBITJC'=WQ/OQ><\A>7+:P.T&"?%A03KOAI
+MO`VV&#"N4"%@V7QE7=9U8UJ]Y(!==OJU<PFBADFL.BE!PN>)1$BI5;:PC-])
+MZ96,.NF.4)L7O*PSL4,"8,ZX.5'\**B(A[P;R\XV$"2V@**/3(@$FAVQ/PYT
+M!<",<SY6%*H2BI"V24;!L-.FX\P"C7KLU;;,$)AR3QF!3D^I7JT&)8/>\*J=
+M>NUT%1UVFW79[PPJQ*UQFQ]Z3J,+_F`H4:M%LS%`C78U9E?3P;3WM#NHQ3$?
+M*-FEZ(].^Z=<W'<SON6G>J3TF#*2:"YEY1@N4EZ+IOUV&'!*1IV,LE'O&3<9
+M%S="HV_HDA%JL5M#`B"4%@A$9MTT5\DMO52X;M\UY%WYV`(BY9A%R7AJ95`R
+MYUZ"[X$ZFX2QW5U.D#B]U*EZ?5,H;TJ@NN*F!3EW9<TC,.^6G&ICWG?"=,7.
+M0EW:I93=<=*5Q"&EEU+<HML>+\H)U<04C2RXYYK3_B&+&6<<5O![9UQ7K,3?
+MZK`=2N[XJ[=,K5:#2-Z"3ATBT0JIS3M@DS?DE0QJU2=K6DI&)"6CT_..*3KK
+MA#==75;DBEV'GO8KSZH7Q(P)*E91MNBD7_I0)+#95^Q4-&,>C;;HUBUPQ3O.
+M>[!L^V7]H-[W_5Q/K.%21;-I5=*&_<+;2@*1M&9;M6C0J%;9O'MNNBVWBIFD
+MD_*?-.1=UY&J&%Z-9CT.R&BJY%3TB:Q`*F94(>YLGSN;5CGD%3?\UK5XHRB&
+MK='N!XY62KI4F[+"HT[7@>U^9)^3KE7FLBAVG[QIYSWIDS7<]!'']R?L%\JN
+M&%ZC>"1)&W%C8Q>0>3G5MJA*C"L/C;E#ATLFUW5?#!]&.N:,R$';I1(T):53
+MOUD7/C.8/^HL^]K#=I/5["F-[EM0%@C5:-;G&8%!X^N^!45+0\N7?5NO&2-N
+MFY;2:+.,&RZYNT(^ZP+XM+UWV:5%H*0D;]*8NQ8_]Q;V&``/RUHMC+M4:<,O
+>`H(O7B7\_P/\!Z:YS:#?WU;,`````$E%3D2N0F""
+`
+end
only in patch2:
unchanged:
--- g3data-1.5.3.orig/debian/g3data.desktop
+++ g3data-1.5.3/debian/g3data.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=G3Data Graph Analyzer
+Name[en_GB]=g3data Graph Analyser
+GenericName=Graph Analyzer
+GenericName[en_GB]=Graph Analyser
+Comment=Retrieve data from scanned images of graphs
+Type=Application
+Exec=g3data
+Icon=g3data
+Categories=Science;Education;Graphics;