[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta4-536-g66ce926

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 66ce92606562aae2e905326ead83abd1a0b55cdf
Author: Sven Hoexter <sven at timegate.de>
Date:   Mon Mar 7 23:35:40 2011 +0100

    Refresh debian/patches/prefer-xdg-open.

diff --git a/debian/changelog b/debian/changelog
index 9562c01..e1f917e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ lyx (2.0.0~rc1-1) UNRELEASED; urgency=low
     to remove the old defoma hints file.
   * Build --without-included-mythes (Closes: #612327)
     Kudos to Rene Engelhard and Georg Baum for implementing it right away.
+  * Refresh debian/patches/prefer-xdg-open.
 
  -- Per Olofsson <pelle at debian.org>  Mon, 07 Feb 2011 15:55:44 +0100
 
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index c760c85..e240861 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -22,34 +22,34 @@ Add xdg-open as the first choice whenever this seems to be usefull.
 -    checkViewer('a PDF previewer', ['kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
 +    checkViewer('a PDF previewer', ['xdg-open', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
  		    'gv', 'ghostview'],
-         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector"
- \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector"
+         rc_entry = [r'''\Format pdf        pdf    "PDF (ps2pdf)"          P  "%%"	""	"document,vector,menu=export"
+ \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector,menu=export"
 @@ -547,24 +547,24 @@ def checkFormatEntries(dtl_tools):
- \Format pdf4       pdf    "PDF (XeTeX)"           X  "%%"	""	"document,vector"
- \Format pdf5       pdf    "PDF (LuaTeX)"          u  "%%"	""	"document,vector"'''])
+ \Format pdf4       pdf    "PDF (XeTeX)"           X  "%%"	""	"document,vector,menu=export"
+ \Format pdf5       pdf    "PDF (LuaTeX)"          u  "%%"	""	"document,vector,menu=export"'''])
      #
 -    checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
 +    checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
-         rc_entry = [r'''\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector"
- \Format dvi3       dvi     "DVI (LuaTeX)"          V  "%%"	""	"document,vector"'''])
+         rc_entry = [r'''\Format dvi        dvi     DVI                    D  "%%"	""	"document,vector,menu=export"
+ \Format dvi3       dvi     "DVI (LuaTeX)"          V  "%%"	""	"document,vector,menu=export"'''])
      if dtl_tools:
          # Windows only: DraftDVI
          addToRC(r'\Format dvi2       dvi     DraftDVI               ""	""	""	"vector"')
      #
 -    checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
 +    checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
-         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document"'])
+         rc_entry = [r'\Format html       html    HTML                   H  "%%"	""	"document,menu=export"'])
      #
      checkViewerEditor('Noteedit', ['noteedit'],
          rc_entry = [r'\Format noteedit   not     Noteedit               "" "%%"	"%%"	"vector"'])
      #
 -    checkViewerEditor('an OpenDocument/OpenOffice viewer', ['swriter', 'oowriter', 'abiword'],
 +    checkViewerEditor('an OpenDocument/OpenOffice viewer', ['xdg-open', 'swriter', 'oowriter', 'abiword'],
-         rc_entry = [r'''\Format odt        odt     OpenDocument           "" "%%"	"%%"	"document,vector"
+         rc_entry = [r'''\Format odt        odt     OpenDocument           "" "%%"	"%%"	"document,vector,menu=export"
  \Format sxw        sxw    "OpenOffice.Org (sxw)"  "" ""	""	"document,vector"'''])
      # 
 -    checkViewerEditor('a Rich Text and Word viewer', ['swriter', 'oowriter', 'abiword'],
 +    checkViewerEditor('a Rich Text and Word viewer', ['xdg-open', 'swriter', 'oowriter', 'abiword'],
-         rc_entry = [r'''\Format rtf        rtf    "Rich Text Format"      "" "%%"	"%%"	"document,vector"
- \Format word       doc    "MS Word"               W  "%%"	"%%"	"document,vector"'''])
+         rc_entry = [r'''\Format rtf        rtf    "Rich Text Format"      "" "%%"	"%%"	"document,vector,menu=export"
+ \Format word       doc    "MS Word"               W  "%%"	"%%"	"document,vector,menu=export"'''])
      #

-- 
LyX packaging