diff -u ipe-6.0pre28/debian/changelog ipe-6.0pre28/debian/changelog
--- ipe-6.0pre28/debian/changelog
+++ ipe-6.0pre28/debian/changelog
@@ -1,3 +1,17 @@
+ipe (6.0pre28-3ubuntu1) gutsy; urgency=low
+
+  * debian/ipe.{desktop,png.uu}: (LP: #60878)
+    - added files to provides an icon and desktop file
+  * debian/control: (LP: #137255)
+    - Updated to match Ubuntu Maintainer Policy
+    - Removed Build-Deps-Conflicts against libfreetype6-dev >= 2.2.2
+    - Removed Conflicts line against libfreetype6-dev >= 2.2.2 in package
+      libipe1c2a
+  * debian/rules:
+    - Added lines to install desktop and png file.
+
+ -- Stephan Hermann <sh@sourcecode.de>  Tue, 04 Sep 2007 14:24:17 +0200
+
 ipe (6.0pre28-3) unstable; urgency=low
 
   * Apply patch http://tclab.kaist.ac.kr/ipe/pdftex1.40patches.zip
diff -u ipe-6.0pre28/debian/control ipe-6.0pre28/debian/control
--- ipe-6.0pre28/debian/control
+++ ipe-6.0pre28/debian/control
@@ -1,9 +1,10 @@
 Source: ipe
 Section: graphics
 Priority: optional
-Maintainer: Steve M. Robbins <smr@debian.org>
+XSBC-Original-Maintainer: Steve M. Robbins <smr@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 Build-Depends: debhelper (>= 5), libqt4-dev, qt4-dev-tools, libfreetype6-dev (>= 2.2.1), zlib1g-dev
-Build-Conflicts: libipe1-dev, libfreetype6-dev (>= 2.2.2)
+Build-Conflicts: libipe1-dev
 Standards-Version: 3.6.1.0
 
 Package: ipe
@@ -39,7 +40,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libfreetype6 (>= 2.2.2)
 Description: Ipe library used by ipelets
  This package provides a library used by Ipe and its extensions.
  Ipelets are plug-ins for Ipe that are used to add functionality to
diff -u ipe-6.0pre28/debian/rules ipe-6.0pre28/debian/rules
--- ipe-6.0pre28/debian/rules
+++ ipe-6.0pre28/debian/rules
@@ -68,6 +68,10 @@
 	dh_installdirs
 
 	$(MAKE) -C src install INSTALL_ROOT=`pwd`/debian/tmp
+	mkdir -p debian/ipe/usr/share/pixmaps/
+	uudecode -o debian/ipe/usr/share/pixmaps/ipe.png debian/ipe.png.uu
+	mkdir -p debian/ipe/usr/share/applications
+	cp -v debian/ipe.desktop debian/ipe/usr/share/applications/
 
 	# Package: ipe
 	dh_install     -pipe debian/tmp/usr/bin
only in patch2:
unchanged:
--- ipe-6.0pre28.orig/debian/ipe.desktop
+++ ipe-6.0pre28/debian/ipe.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=IPE drawing editor
+GenericName=PDF Figure Editor
+Comment=Drawing editor for creating figures in PDF or PS formats
+Exec=ipe
+Icon=ipe
+Terminal=false
+Categories=Graphics;2DGraphics;RasterGraphics;GTK;
+StartupNotify=true
+
only in patch2:
unchanged:
--- ipe-6.0pre28.orig/debian/ipe.png.uu
+++ ipe-6.0pre28/debian/ipe.png.uu
@@ -0,0 +1,11 @@
+begin 644 ipe.png
+MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``+&/
+M"_QA!0````9B2T=$`/\`_P#_H+VGDP````EP2%ES```+$P``"Q,!`)J<&```
+M``=T24U%!]<)!`L`(':FO#@```"G241!5%C#[59!#H`@#%N)__]RO9B(9L8P
+M.C"&'D&VV;4#LX7)0/`<5?$@3!Z*66+)V5B3C@&J8VXF$`$Z1%AFNZ"(6X:A
+M&J`?(,T%%'_75"VS'(9(<M*O!T!S?*D+G@KK88"1)#<F(&,@\H>_&40]TY8R
+M!AR5#VT!,N9`\UWPQH+C`*2\B#Q'5,EAF>(BC7<B2+-C#9;55_*J:.`\7^_5
+<ZY^?`PL+"SNU`RHL0QFUA0````!)14Y$KD)@@@``
+`
+end
+