[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/1.6.6-462-g81e8922

[Sven Hoexter]

The following commit has been merged in the master branch:
commit e0fd6dc88facd0870e5feae5026fca0fef566c00
Author: Sven Hoexter <sven at timegate.de>
Date:   Thu May 20 13:33:58 2010 +0200

    Refresh debian/patches/prefer-xdg-open.

diff --git a/debian/changelog b/debian/changelog
index 0f884a3..eeb792f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ lyx (1.6.6-1) UNRELEASED; urgency=low
   [ Sven Hoexter ]
   * New upstream release.
     + Should no longer crash when inserting floats. Closes: #579630
+    + Refresh debian/patches/prefer-xdg-open.
   * Bump Standards-Version to 3.8.4 - no changes required.
   * Add debian/source/format to state that this is still a package in
     1.0 format.
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index d143de0..755c330 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -1,16 +1,16 @@
 Add xdg-open as the first choice whenever this seems to be usefull.
 --- a/lib/configure.py
 +++ b/lib/configure.py
-@@ -276,7 +276,7 @@ def checkFormatEntries(dtl_tools):  
-     checkViewer('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
-         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
+@@ -279,7 +279,7 @@ def checkFormatEntries(dtl_tools):
+     checkViewer('an SVG viewer and editor', ['inkscape'],
+         rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
      #
 -    path, iv = checkViewer('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'])
 +    path, iv = checkViewer('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'])
      path, ie = checkViewer('a raster image editor', ['gimp-remote', 'gimp'])
      addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
  \Format gif        gif     GIF                    "" "%s"	"%s"	""
-@@ -319,29 +319,29 @@ def checkFormatEntries(dtl_tools):  
+@@ -322,29 +322,29 @@ def checkFormatEntries(dtl_tools):
      #
      #checkProg('a Postscript interpreter', ['gs'],
      #  rc_entry = [ r'\ps_command "%%"' ])

-- 
LyX packaging