[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_beta4-527-g93dc68c

Tue Feb 8 15:08:06 UTC 2011

The following commit has been merged in the master branch:
commit 93dc68ccaa9b8b86598beef89adf11fd34e8a2f5
Author: Sven Hoexter <sven at timegate.de>
Date:   Tue Feb 8 12:22:57 2011 +0100

    Add debian/patches/use-system-libmythes and a build depedency on
    libmythes-dev to use the system wide libmythes.

diff --git a/debian/changelog b/debian/changelog
index 0646ddb..9f520f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ lyx (2.0.0~beta4-2) UNRELEASED; urgency=low
 
   [ Rene Engelhard ]
   * Add a symlink so that LyX can access the mythes thesaurus files.
+  * Add debian/patches/use-system-libmythes and a build depedency on
+    libmythes-dev to use the system wide libmythes. (Closes: #612327)
 
  -- Per Olofsson <pelle at debian.org>  Mon, 07 Feb 2011 15:55:44 +0100
 
diff --git a/debian/control b/debian/control
index f5667d4..1ad2c1c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Git: git://git.debian.org/git/pkg-lyx/lyx.git
 Vcs-Browser: http://git.debian.org/?p=pkg-lyx/lyx.git
 Homepage: http://www.lyx.org/
 Build-Depends: python (>= 2.6.6-3), debhelper (>= 8),
- libz-dev, libx11-dev, libenchant-dev,
+ libz-dev, libx11-dev, libenchant-dev, libmythes-dev,
  autotools-dev, libqt4-dev, libboost-dev,
  libboost-filesystem-dev, libboost-signals-dev,
  libboost-iostreams-dev, libboost-regex-dev, libboost-test-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 3e16998..d257d46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+use-system-libmythes
 prefer-xdg-open
diff --git a/debian/patches/use-system-libmythes b/debian/patches/use-system-libmythes
new file mode 100644
index 0000000..95decd6
--- /dev/null
+++ b/debian/patches/use-system-libmythes
@@ -0,0 +1,105 @@
+Build with the system wide libmythes instead of using the one included
+in LyX.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612327
+http://www.lyx.org/trac/ticket/7288
+--- a/src/Thesaurus.cpp
++++ b/src/Thesaurus.cpp
+@@ -23,7 +23,7 @@
+ #include "support/lstrings.h"
+ #include "support/os.h"
+ 
+-#include "support/mythes/mythes.hxx"
++#include <mythes.hxx>
+ 
+ #include "frontends/alert.h"
+ 
+--- a/src/support/Makefile.am
++++ b/src/support/Makefile.am
+@@ -102,10 +102,7 @@ liblyxsupport_a_SOURCES = \
+ 	userinfo.h \
+ 	unicode.cpp \
+ 	unicode.h \
+-	weighted_btree.h \
+-	mythes/mythes.cxx \
+-	mythes/mythes.hxx \
+-	mythes/license.readme
++	weighted_btree.h
+ 
+ #if INSTALL_MACOSX
+ #liblyxsupport_a_SOURCES += \
+--- a/src/support/Makefile.in
++++ b/src/support/Makefile.in
+@@ -107,7 +107,6 @@ am__liblyxsupport_a_SOURCES_DIST = FileM
+ 	Systemcall.cpp Systemcall.h SystemcallPrivate.h shared_ptr.h \
+ 	textutils.h Translator.h Timeout.cpp Timeout.h types.h \
+ 	userinfo.cpp userinfo.h unicode.cpp unicode.h weighted_btree.h \
+-	mythes/mythes.cxx mythes/mythes.hxx mythes/license.readme \
+ 	AppleSpeller.h AppleSpeller.m linkback/LinkBack.h \
+ 	linkback/LinkBack.m linkback/LinkBackProxy.h \
+ 	linkback/LinkBackProxy.m linkback/LinkBackServer.h \
+@@ -125,7 +124,7 @@ am_liblyxsupport_a_OBJECTS = FileMonitor
+ 	os.$(OBJEXT) Path.$(OBJEXT) Package.$(OBJEXT) \
+ 	qstring_helpers.$(OBJEXT) socktools.$(OBJEXT) \
+ 	Systemcall.$(OBJEXT) Timeout.$(OBJEXT) userinfo.$(OBJEXT) \
+-	unicode.$(OBJEXT) mythes.$(OBJEXT) $(am__objects_1)
++	unicode.$(OBJEXT) $(am__objects_1)
+ liblyxsupport_a_OBJECTS = $(am_liblyxsupport_a_OBJECTS)
+ am_check_convert_OBJECTS = check_convert.$(OBJEXT) boost.$(OBJEXT)
+ check_convert_OBJECTS = $(am_check_convert_OBJECTS)
+@@ -465,7 +464,6 @@ liblyxsupport_a_SOURCES = FileMonitor.h
+ 	Systemcall.cpp Systemcall.h SystemcallPrivate.h shared_ptr.h \
+ 	textutils.h Translator.h Timeout.cpp Timeout.h types.h \
+ 	userinfo.cpp userinfo.h unicode.cpp unicode.h weighted_btree.h \
+-	mythes/mythes.cxx mythes/mythes.hxx mythes/license.readme \
+ 	$(am__append_1)
+ TESTS = \
+ 	tests/test_convert \
+@@ -494,7 +492,7 @@ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .gch .cpp .cxx .m .o .obj
++.SUFFIXES: .gch .cpp .m .o .obj
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/common.am $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -580,7 +578,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lstrings.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lyxtime.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mutex.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mythes.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/os.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/qstring_helpers.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/socktools.Po at am__quote@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,6 +15,8 @@ SUBDIRS = support frontends . $(CLIENT)
+ 
+ EXTRA_DIST = pch.h
+ 
++MYTHES_LIBS := `pkg-config --libs mythes`
++
+ OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
+ 		 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -713,7 +713,7 @@ SUBDIRS = support frontends . $(CLIENT)
+ 
+ ############################### Mathed  ##############################
+ EXTRA_DIST = pch.h mathed/InsetFormulaMacro.cpp
+-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
++OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) \
+ 		 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+ 
+ 
+@@ -732,7 +732,8 @@ lyx_LDADD = \
+ 	support/liblyxsupport.a \
+ 	$(OTHERLIBS) \
+ 	$(QT4_LDFLAGS) \
+-	$(QT4_LIB)
++	$(QT4_LIB) \
++	`pkg-config --libs mythes`
+ 
+ 
+ #lyx_LDFLAGS=-Wl,-O1

-- 
LyX packaging

