[Pkg-lyx-devel] svn commit: r604 - in /lyx/trunk/debian: changelog patches/detect-elyxer patches/series

[hoaxter-guest at users.alioth.debian.org]

Author: hoaxter-guest
Date: Wed Jun  3 19:17:40 2009
New Revision: 604

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=604
Log:
Add debian/patches/detect-elyxer. Modifies configure.py to search
for 'elyxer' instead of 'elyxer.py'. The Debian package will ship
the file without the .py extension.

Added:
    lyx/trunk/debian/patches/detect-elyxer
Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/patches/series

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=604&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Wed Jun  3 19:17:40 2009
@@ -9,6 +9,9 @@
   * Lift Build-Depends on libboost-dev up to 1.38.0 - otherwise the
     boost-mt patch will be harmful.
   * Add a ttf-lyx package as replacement for the latex-xft-package.
+  * Add debian/patches/detect-elyxer. Modifies configure.py to search
+    for 'elyxer' instead of 'elyxer.py'. The Debian package will ship
+    the file without the .py extension.
 
  -- Sven Hoexter <sven at timegate.de>  Wed, 03 Jun 2009 20:00:19 +0200
 

Added: lyx/trunk/debian/patches/detect-elyxer
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/patches/detect-elyxer?rev=604&op=file
==============================================================================
--- lyx/trunk/debian/patches/detect-elyxer (added)
+++ lyx/trunk/debian/patches/detect-elyxer Wed Jun  3 19:17:40 2009
@@ -1,0 +1,15 @@
+Search for elyxer instead of elyxer.py.
+--- a/lib/configure.py
++++ b/lib/configure.py
+@@ -389,9 +389,9 @@ def checkConverterEntries():
+     checkProg('an MS Word -> LaTeX converter', ['wvCleanLatex $$i $$o'],
+         rc_entry = [ r'\converter word       latex      "%%"	""' ])
+     #
+-    path, elyxer = checkProg('a LyX -> HTML converter', ['elyxer.py $$i $$o'],
++    path, elyxer = checkProg('a LyX -> HTML converter', ['elyxer $$i $$o'],
+       rc_entry = [ r'\converter lyx      html       "%%"	""' ])
+-    if elyxer.find('elyxer.py') >= 0:
++    if elyxer.find('elyxer') >= 0:
+       addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
+     else:
+       # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/

Modified: lyx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/patches/series?rev=604&op=diff
==============================================================================
--- lyx/trunk/debian/patches/series (original)
+++ lyx/trunk/debian/patches/series Wed Jun  3 19:17:40 2009
@@ -1,2 +1,3 @@
+detect-elyxer
 boost-mt
 prefer-xdg-open