--- kompozer-0.7.10/debian/changelog
+++ kompozer-0.7.10/debian/changelog
@@ -1,3 +1,21 @@
+kompozer (1:0.7.10-0ubuntu5) jaunty; urgency=low
+
+  * Removed debian/kompozer.dirs, never needed.
+  * debian/kompozer.desktop
+   - Moved to "Development" category in desktop file. (LP: #148935)
+   - Added some common mimetypes for a web editor. (LP: #175563)
+   - Added the generic name.
+   - Added Spanish translation
+  * debian/mozconfig.debian
+   - Added --with-system-nspr (LP: #312972)
+   - Added default mozilla five home (LP: #155505)
+  * debian/rules
+   - Added dh_desktop to updates the MIME type cache
+  * debian/kompozer-config.1 and debian/kompozer.manpages
+   - Added manpage from upstream to kompozer-config binary
+
+ -- Surfaz Gemon Meme <surfaz28@gmail.com>  Mon, 09 Mar 2009 23:03:45 +0000
+
 kompozer (1:0.7.10-0ubuntu4) hardy; urgency=low
 
   * Added a version epoch to actually fix the upgrade path this time. (LP: #200349)
--- kompozer-0.7.10/debian/kompozer-config.1
+++ kompozer-0.7.10/debian/kompozer-config.1
@@ -0,0 +1,45 @@
+.TH KompoZer 1 "24 February 2009"
+.SH NAME
+kompozer-config - script to get information about the installed version of KompoZer
+.SH SYNOPSIS
+.B kompozer-config
+[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
+.SH DESCRIPTION
+.PP
+\fIkompozer-config\fP is a tool that is used to configure to determine
+the compiler and linker flags that should be used to compile
+and link plugins/add-ons for \fIKompoZer\fP. 
+.
+.SH OPTIONS
+\fIkompozer-config\fP accepts the following options:
+.TP 8
+.B  \-\-version
+Print the currently installed version of \fIKompoZer\fP on the standard output.
+.TP 8
+.B  \-\-libs [libraries]
+Print the linker flags that are necessary to link a \fIKompoZer\fP program.
+.TP 8
+.B  \-\-cflags [components]
+Print the compiler flags that are necessary to compile a \fIKompoZer\fP program.
+.TP 8
+.B  \-\-prefix=PREFIX
+If specified, use PREFIX instead of the installation prefix that \fIKompoZer\fP
+was built with when computing the output for the \-\-cflags and
+\-\-libs options. This option is also used for the exec prefix
+if \-\-exec\-prefix was not specified. This option must be specified
+before any \-\-libs or \-\-cflags options.
+.TP 8
+.B  \-\-exec\-prefix=PREFIX
+If specified, use PREFIX instead of the installation exec prefix that
+\fIKompoZer\fP was built with when computing the output for the \-\-cflags
+and \-\-libs options.  This option must be specified before any
+\-\-libs or \-\-cflags options.
+.B  \-\-idlflags
+Additional flags to be passed to the
+idl-compiler.
+.SH COPYRIGHT
+Upstream Author: Fabien Cazenave <kaze@kompozer.net>
+
+Copyright: 1998-2007, Contributors
+
+License: MPL 1.1 / GPL 2.0 or subsequent / LGPL 2.1 or subsequent
--- kompozer-0.7.10/debian/kompozer.desktop
+++ kompozer-0.7.10/debian/kompozer.desktop
@@ -1,9 +1,13 @@
 [Desktop Entry]
 Name=KompoZer
+GenericName=Web Authoring System
+GenericName[es]=Sistema de autoria web
 Comment=Create Web Pages
-Categories=Network;WebDevelopment;
+Comment[es]=Crea páginas web
+Categories=Development;WebDevelopment;
 Encoding=UTF-8
 Exec=kompozer
 Icon=kompozer
 Terminal=false
 Type=Application
+MimeType=text/html;text/xml;text/css;text/x-javascript;text/javascript;application/x-php;text/x-php;application/xhtml+xml;
--- kompozer-0.7.10/debian/kompozer.dirs
+++ kompozer-0.7.10/debian/kompozer.dirs
@@ -1 +0,0 @@
-usr/bin
--- kompozer-0.7.10/debian/kompozer.manpages
+++ kompozer-0.7.10/debian/kompozer.manpages
@@ -1 +1,2 @@
 debian/kompozer.1
+debian/kompozer-config.1
--- kompozer-0.7.10/debian/mozconfig.debian
+++ kompozer-0.7.10/debian/mozconfig.debian
@@ -75,6 +75,8 @@
 ac_add_options  --enable-default-toolkit=gtk2
 ac_add_options  --enable-xft
 ac_add_options  --disable-freetype2
+ac_add_options  --with-system-nspr
+ac_add_options  --with-default-mozilla-five-home=/usr/lib/kompozer
 
 # Note: Only include icon for mac, windows and os2
 ac_add_options --enable-image-decoders=default,-xbm
--- kompozer-0.7.10/debian/rules
+++ kompozer-0.7.10/debian/rules
@@ -80,6 +80,7 @@
 	dh_installexamples -a
 	dh_installman -a
 	dh_link -a
+	dh_desktop -pkompozer
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a