[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. debian/2.0.5.1-1-4-gfaa9721

[Nick Andrik]

The following commit has been merged in the master branch:
commit faa97215e721ec054f95348cd05796ebe9f1a979
Author: Nick Andrik <nick.andrik at gmail.com>
Date:   Mon May 27 00:03:43 2013 +0200

    Updated prefer-xdg-open patch since new upsteram includes more programs

diff --git a/debian/changelog b/debian/changelog
index 20c9977..9a577d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lyx (2.0.6-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bumped up Standards version to 3.9.4 (no changes needed)
+  * Updated prefer-xdg-open patch since new upsteram includes more programs
 
  -- Nick Andrik <nick.andrik at gmail.com>  Sun, 26 May 2013 23:56:27 +0200
 
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index d1a8f9f..77ec150 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -1,9 +1,9 @@
 Add xdg-open as the first choice whenever this seems to be usefull.
-Index: lyx-2.0.5.1/lib/configure.py
+Index: lyx/lib/configure.py
 ===================================================================
---- lyx-2.0.5.1.orig/lib/configure.py	2013-01-02 16:04:16.000000000 +0100
-+++ lyx-2.0.5.1/lib/configure.py	2013-03-12 01:47:26.651431202 +0100
-@@ -542,7 +542,7 @@
+--- lyx.orig/lib/configure.py	2013-05-26 23:29:26.833885599 +0200
++++ lyx/lib/configure.py	2013-05-26 23:29:26.829885599 +0200
+@@ -547,7 +547,7 @@
      checkViewerEditor('a SVG viewer and editor', ['inkscape'],
          rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
      #
@@ -12,7 +12,7 @@ Index: lyx-2.0.5.1/lib/configure.py
          rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
  \Format gif        gif     GIF                    "" "%s"	"%s"	""
  \Format jpg        jpg     JPEG                   "" "%s"	"%s"	""
-@@ -624,11 +624,11 @@
+@@ -630,11 +630,11 @@
      #
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
@@ -21,12 +21,12 @@ Index: lyx-2.0.5.1/lib/configure.py
          rc_entry = [r'''\Format eps        eps     EPS                    "" "%%"	""	"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', \
+-    checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'evince', 'kghostview', 'xpdf', 'acrobat', 'acroread', \
++    checkViewer('a PDF previewer', ['xdg-open', 'pdfview', '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"
-@@ -636,24 +636,24 @@
+@@ -642,24 +642,24 @@
  \Format pdf4       pdf    "PDF (XeTeX)"           X  "%%"	""	"document,vector,menu=export"
  \Format pdf5       pdf    "PDF (LuaTeX)"          u  "%%"	""	"document,vector,menu=export"'''])
      #

-- 
LyX packaging