[Pkg-lyx-devel] [lyx] 01/01: Updated prefer-xdg-open patch.
Sven Hoexter
hoexter at moszumanska.debian.org
Wed Sep 24 16:47:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
hoexter pushed a commit to branch master
in repository lyx.
commit c460a547b080ece88783fda67e4713c8b55386a5
Author: Sven Hoexter <sven at timegate.de>
Date: Wed Sep 24 18:47:17 2014 +0200
Updated prefer-xdg-open patch.
---
debian/changelog | 1 +
debian/patches/prefer-xdg-open | 89 ++++++++++++++++++------------------------
2 files changed, 40 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a2d94d6..0f0de5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
lyx (2.1.2-1) UNRELEASED; urgency=low
* New upstream release.
+ + Updated prefer-xdg-open patch.
* Add --disable-silent-rules to the list of configure flags.
http://lists.debian.org/debian-devel/2013/06/msg00539.html
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index 77ec150..2afc279 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -1,57 +1,46 @@
Add xdg-open as the first choice whenever this seems to be usefull.
Index: lyx/lib/configure.py
===================================================================
---- 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"'])
- #
-- path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'],
-+ path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'],
- rc_entry = [r'''\Format bmp bmp BMP "" "%s" "%s" ""
- \Format gif gif GIF "" "%s" "%s" ""
- \Format jpg jpg JPEG "" "%s" "%s" ""
-@@ -630,11 +630,11 @@
+--- lyx.orig/lib/configure.py 2014-09-24 18:32:11.000000000 +0200
++++ lyx/lib/configure.py 2014-09-24 18:45:54.939852584 +0200
+@@ -572,7 +572,7 @@
+ checkViewerEditor('a Dia viewer and editor', ['dia'],
+ rc_entry = [r'\Format dia dia DIA "" "%%" "%%" "vector,zipped=native", "application/x-dia-diagram"'])
+ #
+- checkViewerEditor('an OpenOffice drawing viewer and editor', ['libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
++ checkViewerEditor('an OpenOffice drawing viewer and editor', ['xdg-open','libreoffice', 'lodraw', 'ooffice', 'oodraw', 'soffice'],
+ rc_entry = [r'\Format odg "odg, sxd" "OpenOffice drawing" "" "%%" "%%" "vector,zipped=native" "application/vnd.oasis.opendocument.graphics"'])
+ #
+ checkViewerEditor('a Grace viewer and editor', ['xmgrace'],
+@@ -594,12 +594,12 @@
+ \Format tiff tif TIFF "" "%s" "%s" "" "image/tiff"
+ \Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap"
+ \Format xpm xpm XPM "" "%s" "%s" "" "image/x-xpixmap"'''
+- path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats])
++ path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open','xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats])
+ path, ie = checkEditorNoRC('a raster image editor', ['gimp-remote', 'gimp'], rc_entry = [imageformats])
+ addToRC(imageformats % \
+ (iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) )
+ #
+- checkViewerEditor('a text editor', ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
++ checkViewerEditor('a text editor', ['xdg-open','xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \
+ 'nedit', 'gedit', 'notepad', 'geany', 'leafpad', 'mousepad'],
+ rc_entry = [r'''\Format asciichess asc "Plain text (chess output)" "" "" "%%" "" ""
+ \Format asciiimage asc "Plain text (image)" "" "" "%%" "" ""
+@@ -646,14 +646,14 @@
#
#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,menu=export"'''])
+- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
++ checkViewer('a Postscript previewer', ['xdg-open','kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
+ rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps"
+ \Format eps2 eps "EPS (uncropped)" "" "%%" "" "vector" ""
+ \Format eps3 eps "EPS (cropped)" "" "%%" "" "document,menu=export" ""
+ \Format ps ps Postscript t "%%" "" "document,vector,menu=export" "application/postscript"'''])
# for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html
-- 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"
-@@ -642,24 +642,24 @@
- \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,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,menu=export"'])
- #
- checkViewerEditor('Noteedit', ['noteedit'],
- rc_entry = [r'\Format noteedit not Noteedit "" "%%" "%%" "vector"'])
- #
-- 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', ['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"'''])
- #
+ # the MIME type is set for pdf6, because that one needs to be autodetectable by libmime
+- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \
++ checkViewer('a PDF previewer', ['xdg-open','pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \
+ 'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'],
+ rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "document,vector,menu=export" ""
+ \Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector,menu=export" ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lyx/lyx.git
More information about the Pkg-lyx-devel
mailing list