--- ./kbarcode/kbarcode-batch.desktop.orig	2008-03-30 10:31:03.000000000 +0200
+++ ./kbarcode/kbarcode-batch.desktop	2008-03-30 10:31:32.000000000 +0200
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=kbarcode --batch
-Icon=kbarcode.png
-DocPath=kbarcode/index.html
+Icon=kbarcode
+X-DocPath=kbarcode/index.html
 Comment=Barcode and label printing tool (batch printing mode)
 Comment[de]=Werkzeug zum Barcode und Etiketten Druck (Stapelverarbeitung)
 Terminal=false
--- ./kbarcode/kbarcode-editor.desktop.orig	2008-03-30 10:23:10.000000000 +0200
+++ ./kbarcode/kbarcode-editor.desktop	2008-03-30 10:23:32.000000000 +0200
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=kbarcode --label
-Icon=kbarcode.png
-DocPath=kbarcode/index.html
+Icon=kbarcode
+X-DocPath=kbarcode/index.html
 Comment=Barcode and label printing tool (editor)
 Comment[de]=Werkzeug zum Barcode und Etiketten Druck (Editor)
 Terminal=false
--- ./kbarcode/kbarcode-single.desktop.orig	2008-03-30 10:32:30.000000000 +0200
+++ ./kbarcode/kbarcode-single.desktop	2008-03-30 10:52:42.000000000 +0200
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=kbarcode --barcode
-Icon=kbarcode.png
-DocPath=kbarcode/index.html
+Icon=kbarcode
+X-DocPath=kbarcode/index.html
 Comment=Barcode generation tool
 Comment[de]=Barcode Erstellung
-Terminal=0
+Terminal=false
 Name=KBarcode Barcode Generator
 Name[de]=KBarcode Barcode Generator
 Categories=Qt;KDE;Office;
--- ./kbarcode/kbarcode.desktop.orig	2008-03-30 11:00:33.000000000 +0200
+++ ./kbarcode/kbarcode.desktop	2008-03-30 11:05:47.000000000 +0200
@@ -1,13 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=kbarcode -caption "%c" %i %m %f
-Icon=kbarcode.png
-MimeType=application/kbarcode-label
-DocPath=kbarcode/index.html
+Icon=kbarcode
+MimeType=application/kbarcode-label;
+X-DocPath=kbarcode/index.html
 Comment=Barcode and label printing tool
 Comment[de]=Werkzeug zum Barcode und Etiketten Druck
-Terminal=0
 Name=KBarcode
 Name[de]=KBarcode
 Categories=Qt;KDE;Office;
--- kbarcode/Makefile.am.orig	2008-03-30 10:28:22.000000000 +0200
+++ kbarcode/Makefile.am	2008-03-30 11:09:04.000000000 +0200
@@ -52,7 +52,7 @@
 	csvfile.cpp referencecounted.cpp dstextedit.cpp encodingcombo.cpp purepostscript.cpp tbarcode2.cpp \
 	kactionmap.cpp
 
-xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-label.desktop kbarcode-single.desktop
+xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-single.desktop
 
 datafiles_DATA = logo.png barcodes.html exampledata.sql labeldefinitions.sql barcode.ps rules.xml
 datafilesdir = $(kde_datadir)/kbarcode