diff -u lyx-1.4.1/debian/lyx-xforms.install lyx-1.4.1/debian/lyx-xforms.install
--- lyx-1.4.1/debian/lyx-xforms.install
+++ lyx-1.4.1/debian/lyx-xforms.install
@@ -2 +2 @@
-
+debian/lyx-xforms.desktop usr/share/applications
diff -u lyx-1.4.1/debian/changelog lyx-1.4.1/debian/changelog
--- lyx-1.4.1/debian/changelog
+++ lyx-1.4.1/debian/changelog
@@ -1,3 +1,12 @@
+lyx (1.4.1-2ubuntu1) edgy; urgency=low
+
+  * Resync with Debian
+  * Add files debian/lyx-xforms.desktop, debian/lyx.xml
+  * debian/lyx-common.{install, dirs} add lyx.xml
+  * debian/lyx-xforms.{install, dirs} add lyx-xforms.desktop
+
+ -- Barry deFreese <bddebian@comcast.net>  Thu,  6 Jul 2006 16:41:25 -0400
+
 lyx (1.4.1-2) unstable; urgency=low
 
   [ Per Olofsson ]
diff -u lyx-1.4.1/debian/lyx-qt.desktop lyx-1.4.1/debian/lyx-qt.desktop
--- lyx-1.4.1/debian/lyx-qt.desktop
+++ lyx-1.4.1/debian/lyx-qt.desktop
@@ -7,7 +7,7 @@
 Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
 Exec=lyx-qt %F
 TryExec=lyx-qt
-Icon=lyx-qt.xpm
+Icon=lyx-qt
 StartupNotify=false
 StartupWMClass=Lyx-qt
 Terminal=false
diff -u lyx-1.4.1/debian/lyx-xforms.dirs lyx-1.4.1/debian/lyx-xforms.dirs
--- lyx-1.4.1/debian/lyx-xforms.dirs
+++ lyx-1.4.1/debian/lyx-xforms.dirs
@@ -3 +3 @@
-
+usr/share/pixmaps/
diff -u lyx-1.4.1/debian/lyx-common.dirs lyx-1.4.1/debian/lyx-common.dirs
--- lyx-1.4.1/debian/lyx-common.dirs
+++ lyx-1.4.1/debian/lyx-common.dirs
@@ -3 +3 @@
-
+usr/share/mime/packages/
diff -u lyx-1.4.1/debian/lyx-common.install lyx-1.4.1/debian/lyx-common.install
--- lyx-1.4.1/debian/lyx-common.install
+++ lyx-1.4.1/debian/lyx-common.install
@@ -6 +6 @@
-
+debian/lyx.xml debian/lyx-common/usr/share/mime/packages/
only in patch2:
unchanged:
--- lyx-1.4.1.orig/debian/lyx.xml
+++ lyx-1.4.1/debian/lyx.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="application/x-lyx">
+    <comment xml:lang="en">Lyx document</comment>
+    <glob pattern="*.lyx"/>
+  </mime-type>
+</mime-info>
+
only in patch2:
unchanged:
--- lyx-1.4.1.orig/debian/lyx-xforms.desktop
+++ lyx-1.4.1/debian/lyx-xforms.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.5
+Type=Application
+Name=LyX
+GenericName=Structured Word Processor
+Comment=WYSIWYM (What You See Is What You Mean) word processor with LaTeX output
+Exec=lyx-xforms %F
+TryExec=lyx-xforms
+Icon=lyx-xforms
+StartupNotify=false
+StartupWMClass=Lyx-xforms
+Terminal=false
+Categories=Qt;WordProcessor;
+MimeType=text/x-lyx;application/x-lyx;