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

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

Author: hoaxter-guest
Date: Wed Jun 24 19:52:42 2009
New Revision: 635

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=635
Log:
Update detect-elyxer. Now all images are included in the output
directory.

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

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=635&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Wed Jun 24 19:52:42 2009
@@ -1,6 +1,8 @@
 lyx (1.6.3-2) UNRELEASED; urgency=low
 
   * Add a ttf-lyx package as replacement for the latex-xft-package.
+  * Update detect-elyxer. Now all images are included in the output
+    directory.
 
  -- Sven Hoexter <sven at timegate.de>  Wed, 24 Jun 2009 20:12:24 +0200
 

Modified: lyx/trunk/debian/patches/detect-elyxer
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/patches/detect-elyxer?rev=635&op=diff
==============================================================================
--- lyx/trunk/debian/patches/detect-elyxer (original)
+++ lyx/trunk/debian/patches/detect-elyxer Wed Jun 24 19:52:42 2009
@@ -1,15 +1,17 @@
 Search for elyxer.py and elyxer.
 --- a/lib/configure.py
 +++ b/lib/configure.py
-@@ -389,9 +389,9 @@ def checkConverterEntries():
+@@ -389,10 +389,10 @@ 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.py $$i $$o', 'elyxer $$i $$o'],
++    path, elyxer = checkProg('a LyX -> HTML converter', ['elyxer.py --directory $$r $$i $$o','elyxer --directory $$r $$i $$o'],
        rc_entry = [ r'\converter lyx      html       "%%"	""' ])
 -    if elyxer.find('elyxer.py') >= 0:
+-      addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
 +    if elyxer.find('elyxer') >= 0:
-       addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
++      addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py -e html,png,jpg,jpeg,css $$i $$o"''')
      else:
        # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/
+       path, htmlconv = checkProg('a LaTeX -> HTML converter', ['htlatex $$i', 'htlatex.sh $$i', \