[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. 36c9bbc26d5955d6afefa917cb9321bf2df242f2
Per Olofsson
pelle at dsv.su.se
Tue Aug 25 21:41:20 UTC 2009
The following commit has been merged in the master branch:
commit 36c9bbc26d5955d6afefa917cb9321bf2df242f2
Author: Per Olofsson <pelle at dsv.su.se>
Date: Tue Aug 25 23:40:56 2009 +0200
Drop patches detect-elyxer, boost-mt (applied upstream).
diff --git a/debian/changelog b/debian/changelog
index e6186c2..4a3787e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
lyx (1.6.4-1) UNRELEASED; urgency=low
* New upstream release.
+ - Drop patches detect-elyxer, boost-mt (applied upstream).
-- Per Olofsson <pelle at debian.org> Tue, 25 Aug 2009 23:27:49 +0200
diff --git a/debian/patches/boost-mt b/debian/patches/boost-mt
deleted file mode 100644
index 5e00a4b..0000000
--- a/debian/patches/boost-mt
+++ /dev/null
@@ -1,239 +0,0 @@
-The new boost symbol names add the -mt suffix again for portability issue.
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -321,10 +321,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- ACLOCAL_AMFLAGS = -I m4 -I config
- DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
- @BUILD_CLIENT_SUBDIR_TRUE at CLIENT = src/client
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -293,10 +293,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- EXTRA_DIST = \
- common.am \
- libtool.m4 \
---- a/config/common.am
-+++ b/config/common.am
-@@ -33,10 +33,10 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
- BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
- else
- BOOST_INCLUDES =
--BOOST_FILESYSTEM = -lboost_filesystem
--BOOST_REGEX = -lboost_regex
--BOOST_SIGNALS = -lboost_signals
--BOOST_IOSTREAMS = -lboost_iostreams
-+BOOST_FILESYSTEM = -lboost_filesystem-mt
-+BOOST_REGEX = -lboost_regex-mt
-+BOOST_SIGNALS = -lboost_signals-mt
-+BOOST_IOSTREAMS = -lboost_iostreams-mt
- BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- endif
-
---- a/development/Makefile.in
-+++ b/development/Makefile.in
-@@ -303,10 +303,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- @INSTALL_MACOSX_TRUE at SUBDIRS = MacOSX
- EXTRA_DIST = boostworkaround.txt coding/Rules coding/Recommendations \
- FORMAT lyx.rpm.README \
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -407,10 +407,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- SUBDIRS = doc lyx2lyx
- CHMOD = chmod
- dist_pkgdata_DATA = CREDITS chkconfig.ltx external_templates encodings \
---- a/lib/doc/Makefile.in
-+++ b/lib/doc/Makefile.in
-@@ -375,10 +375,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- EXTRA_DIST = README.Documentation
- dist_doc_DATA = \
- Customization.lyx \
---- a/lib/lyx2lyx/Makefile.in
-+++ b/lib/lyx2lyx/Makefile.in
-@@ -301,10 +301,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- EXTRA_DIST = lyx2lyx_version.py.in
- CHMOD = chmod
- lyx2lyxdir = $(pkgdatadir)/lyx2lyx
---- a/sourcedoc/Makefile.in
-+++ b/sourcedoc/Makefile.in
-@@ -291,10 +291,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- EXTRA_DIST = Doxyfile.in
- all: all-am
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -612,10 +612,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- @BUILD_CLIENT_SUBDIR_TRUE at CLIENT = client
- SUBDIRS = support frontends . $(CLIENT) tex2lyx
-
---- a/src/client/Makefile.in
-+++ b/src/client/Makefile.in
-@@ -346,10 +346,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- man_MANS = lyxclient.1
- EXTRA_DIST = lyxclient.1in $(am__append_2)
- lyxclient_LDADD = \
---- a/src/frontends/Makefile.in
-+++ b/src/frontends/Makefile.in
-@@ -339,10 +339,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- SUBDIRS = $(FRONTENDS_SUBDIRS) .
- DIST_SUBDIRS = qt4 .
- noinst_LTLIBRARIES = liblyxfrontends.la
---- a/src/frontends/qt4/Makefile.in
-+++ b/src/frontends/qt4/Makefile.in
-@@ -405,10 +405,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h) $(MOCEDFILES) Resources.cpp \
- Resources.qrc $(am__append_1) $(am__append_3)
-
---- a/src/support/Makefile.in
-+++ b/src/support/Makefile.in
-@@ -398,10 +398,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
-
- ############################## Tests ##################################
- EXTRA_DIST = pch.h os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h \
---- a/src/tex2lyx/Makefile.in
-+++ b/src/tex2lyx/Makefile.in
-@@ -342,10 +342,10 @@ SUFFIXES = .gch
- @USE_INCLUDED_BOOST_TRUE at BOOST_INCLUDES = -I$(top_srcdir)/boost
- @USE_INCLUDED_BOOST_FALSE at BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
- @USE_INCLUDED_BOOST_TRUE at BOOST_LIBS = $(top_builddir)/boost/liblyxboost.la
-- at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem
-- at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex
-- at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals
-- at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_FILESYSTEM = -lboost_filesystem-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_REGEX = -lboost_regex-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_SIGNALS = -lboost_signals-mt
-+ at USE_INCLUDED_BOOST_FALSE@BOOST_IOSTREAMS = -lboost_iostreams-mt
- EXTRA_DIST = tex2lyx.1in $(TEST_FILES) pch.h
-
- #noinst_LTLIBRARIES = libtexparser.la
diff --git a/debian/patches/detect-elyxer b/debian/patches/detect-elyxer
deleted file mode 100644
index 3ccaa18..0000000
--- a/debian/patches/detect-elyxer
+++ /dev/null
@@ -1,17 +0,0 @@
-Search for elyxer.py and elyxer.
---- a/lib/configure.py
-+++ b/lib/configure.py
-@@ -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 --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,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', \
diff --git a/debian/patches/prefer-xdg-open b/debian/patches/prefer-xdg-open
index ca37f8d..18dae6c 100644
--- a/debian/patches/prefer-xdg-open
+++ b/debian/patches/prefer-xdg-open
@@ -26,8 +26,8 @@ Add xdg-open as the first choice whenever this seems to be usefull.
\Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector"
\Format pdf3 pdf "PDF (dvipdfm)" m "%%" "" "document,vector"'''])
#
-- checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular'],
-+ checkViewer('a DVI previewer', ['xdg-open','xdvi', 'kdvi', 'okular'],
+- checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
++ checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'dviout -Set=!m'],
rc_entry = [r'\Format dvi dvi DVI D "%%" "" "document,vector"'])
if dtl_tools:
# Windows only: DraftDVI
diff --git a/debian/patches/series b/debian/patches/series
index a7e3dd7..b2d0279 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-detect-elyxer
-boost-mt
prefer-xdg-open
fix-manpage-errors
--
LyX packaging
More information about the Pkg-lyx-devel
mailing list