[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. debian/2.0.1-1-37-g61be9fc

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 1a13aa26f2292c946fa958a1f2e5d90410ff8342
Author: Nick Andrik <nick.andrik at gmail.com>
Date:   Tue Apr 2 03:08:18 2013 +0200

    Update prefer-xdg-open patch since new upsteram includes more programs
    
    Signed-off-by: Sven Hoexter <sven at stormbind.net>

diff --git a/debian/changelog b/debian/changelog
index 52e7769..4a82647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 lyx (2.0.5.1-1) UNRELEASED; urgency=low
 
+  [ Sven Hoexter ]
   * New upstream release.
 
- -- Sven Hoexter <hoexter at debian.org>  Sun, 17 Mar 2013 16:45:04 +0100
+  [ Nick Andrik ]
+  * patches/prefer-xdg-open:
+    - Updated patch since new upsteram includes more programs
+
+ -- Nick Andrik <nick.andrik at gmail.com>  Tue, 02 Apr 2013 02:02:35 +0200
 
 lyx (2.0.3-3) unstable; urgency=low
 
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index 14e1df3..d1a8f9f 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -1,7 +1,9 @@
 Add xdg-open as the first choice whenever this seems to be usefull.
---- a/lib/configure.py
-+++ b/lib/configure.py
-@@ -510,7 +510,7 @@ def checkFormatEntries(dtl_tools):
+Index: lyx-2.0.5.1/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 @@
      checkViewerEditor('a SVG viewer and editor', ['inkscape'],
          rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
      #
@@ -10,7 +12,7 @@ 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"	""
-@@ -587,11 +587,11 @@ def checkFormatEntries(dtl_tools):
+@@ -624,11 +624,11 @@
      #
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])
@@ -24,7 +26,7 @@ Add xdg-open as the first choice whenever this seems to be usefull.
  		    '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"
-@@ -599,24 +599,24 @@ def checkFormatEntries(dtl_tools):
+@@ -636,24 +636,24 @@
  \Format pdf4       pdf    "PDF (XeTeX)"           X  "%%"	""	"document,vector,menu=export"
  \Format pdf5       pdf    "PDF (LuaTeX)"          u  "%%"	""	"document,vector,menu=export"'''])
      #
@@ -43,13 +45,13 @@ Add xdg-open as the first choice whenever this seems to be usefull.
      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'],
+-    checkViewerEditor('an OpenDocument/OpenOffice viewer', ['libreoffice', 'lwriter', 'lowriter', 'oowriter', 'swriter', 'abiword'],
++    checkViewerEditor('an OpenDocument/OpenOffice viewer', ['xdg-open', 'libreoffice', 'lwriter', 'lowriter', 'oowriter', 'swriter', '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'],
+-    checkViewerEditor('a Rich Text and Word viewer', ['libreoffice', 'lwriter', 'lowriter', 'oowriter', 'swriter', 'abiword'],
++    checkViewerEditor('a Rich Text and Word viewer', ['xdg-open', 'libreoffice', 'lwriter', 'lowriter', 'oowriter', 'swriter', 'abiword'],
          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