[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.1-561-g487ba49

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 487ba49fa47883063886526eb48b502e585886ab
Author: Sven Hoexter <sven at timegate.de>
Date:   Sat Sep 10 12:59:27 2011 +0200

    Refresh debian/patches/prefer-xdg-open.

diff --git a/debian/changelog b/debian/changelog
index 162d2c2..4743d15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lyx (2.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
     + Remove debian/patches/path_max_hurd - included upstream.
+    + Refresh debian/patches/prefer-xdg-open.
   * Update Vcs-* to the new anonscm.d.o structure.
   * Add texlive-xetex, etoolbox to the suggests lists and description of
     the lyx binary package. (Closes: #629153)
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index e24a1e7..14e1df3 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -1,7 +1,7 @@
 Add xdg-open as the first choice whenever this seems to be usefull.
 --- a/lib/configure.py
 +++ b/lib/configure.py
-@@ -493,7 +493,7 @@ def checkFormatEntries(dtl_tools):
+@@ -510,7 +510,7 @@ def checkFormatEntries(dtl_tools):
      checkViewerEditor('a SVG viewer and editor', ['inkscape'],
          rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
      #
@@ -10,21 +10,21 @@ Add xdg-open as the first choice whenever this seems to be usefull.
          rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
  \Format gif        gif     GIF                    "" "%s"	"%s"	""
  \Format jpg        jpg     JPEG                   "" "%s"	"%s"	""
-@@ -570,11 +570,11 @@ def checkFormatEntries(dtl_tools):
+@@ -587,11 +587,11 @@ def checkFormatEntries(dtl_tools):
      #
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
 -    checkViewer('a Postscript previewer', ['kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
 +    checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'evince', 'gv', 'ghostview -swap'],
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"vector"
- \Format ps         ps      Postscript             t  "%%"	""	"document,vector"'''])
+ \Format ps         ps      Postscript             t  "%%"	""	"document,vector,menu=export"'''])
      # for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html
 -    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,menu=export"
  \Format pdf2       pdf    "PDF (pdflatex)"        F  "%%"	""	"document,vector,menu=export"
-@@ -582,24 +582,24 @@ def checkFormatEntries(dtl_tools):
+@@ -599,24 +599,24 @@ def checkFormatEntries(dtl_tools):
  \Format pdf4       pdf    "PDF (XeTeX)"           X  "%%"	""	"document,vector,menu=export"
  \Format pdf5       pdf    "PDF (LuaTeX)"          u  "%%"	""	"document,vector,menu=export"'''])
      #
@@ -47,7 +47,7 @@ Add xdg-open as the first choice whenever this seems to be usefull.
 +    checkViewerEditor('an OpenDocument/OpenOffice viewer', ['xdg-open', 'swriter', 'oowriter', 'abiword'],
          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,menu=export"

-- 
LyX packaging