[med-svn] [lamarc] 01/01: Use Debian packaged tinyxml and boost.

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository lamarc.

commit d2bb3acb9313cc9934b9d6cd9dbee7d6a11d16bb
Author: Andreas Tille <tille at debian.org>
Date:   Mon Dec 4 17:42:52 2017 +0100

    Use Debian packaged tinyxml and boost.
---
 debian/patches/series                            |  2 +
 debian/patches/use_debian_packaged_boost.patch   | 36 +++++++++
 debian/patches/use_debian_packaged_tinyxml.patch | 94 ++++++++++++++++++++++++
 3 files changed, 132 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b0c5026
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+use_debian_packaged_tinyxml.patch
+use_debian_packaged_boost.patch
diff --git a/debian/patches/use_debian_packaged_boost.patch b/debian/patches/use_debian_packaged_boost.patch
new file mode 100644
index 0000000..e172d4e
--- /dev/null
+++ b/debian/patches/use_debian_packaged_boost.patch
@@ -0,0 +1,36 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -98,7 +98,7 @@ lamarc_includes         = \
+ 			-I $(lamarc_srcdir)/ui_util \
+ 			-I $(lamarc_srcdir)/ui_vars \
+ 			-I $(lamarc_srcdir)/xml \
+-			-I $(top_srcdir)/boost \
++			-I/usr/include/boost \
+ 			-I $(top_srcdir)/resources
+ 
+ 
+@@ -1144,7 +1144,6 @@ htmltrait_DATA  = \
+ 
+ license_info = \
+ 			COPYING \
+-			doc/licenses/boost.txt \
+ 			doc/licenses/gpl.txt \
+ 			doc/licenses/lamarc.txt \
+ 			doc/licenses/lgpl.txt \
+@@ -1165,7 +1164,6 @@ wx_stuff        = \
+ EXTRA_DIST                      = \
+ 			Makefile.am \
+ 			configure.ac \
+-			boost \
+ 			$(license_info) \
+ 			$(wx_curr) \
+ 			$(scripts_to_dist) \
+@@ -1190,7 +1188,7 @@ EXTRA_DIST                      = \
+ #                       $(vcprojdir)/lamarc.vcproj
+ 
+ dist-hook:
+-	rm -rf `find $(distdir)/boost -name CVS`
++	rm -rf `find . -name CVS`
+ 
+ ## ############################################################
+ ## support for sanity checks
diff --git a/debian/patches/use_debian_packaged_tinyxml.patch b/debian/patches/use_debian_packaged_tinyxml.patch
new file mode 100644
index 0000000..af789e1
--- /dev/null
+++ b/debian/patches/use_debian_packaged_tinyxml.patch
@@ -0,0 +1,94 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,18 +69,6 @@ lam_conv_rc.o   :       $(top_srcdir)/re
+ ## to this list
+ LDADD				=
+ 
+-noinst_LIBRARIES		= libtinyxml.a
+-
+-libtinyxml_a_CXXFLAGS	= -DTIXML_USE_STL
+-
+-libtinyxml_a_SOURCES	= \
+-			tinyxml/tinyxml.h \
+-			tinyxml/tinyxml.cpp \
+-			tinyxml/tinyxmlerror.cpp \
+-			tinyxml/tinyxmlparser.cpp \
+-			tinyxml/tinystr.h \
+-			tinyxml/tinystr.cpp
+-
+ ## ############################################################
+ ## setting up compiler flags
+ ## ############################################################
+@@ -111,8 +99,7 @@ lamarc_includes         = \
+ 			-I $(lamarc_srcdir)/ui_vars \
+ 			-I $(lamarc_srcdir)/xml \
+ 			-I $(top_srcdir)/boost \
+-			-I $(top_srcdir)/resources \
+-			-I $(top_srcdir)/tinyxml
++			-I $(top_srcdir)/resources
+ 
+ 
+ ## include resource file if needed
+@@ -604,14 +591,6 @@ xml_sources     =   \
+ 		    src/xml/toxml.cpp \
+ 		    $(xml_core_sources)
+ 
+-tinyxml_sources =   \
+-		    tinyxml/tinyxml.h \
+-		    tinyxml/tinyxml.cpp \
+-		    tinyxml/tinyxmlerror.cpp \
+-		    tinyxml/tinyxmlparser.cpp \
+-		    tinyxml/tinystr.h \
+-		    tinyxml/tinystr.cpp
+-
+ config_sources  =   \
+ 		    config/conf.h
+ 
+@@ -634,8 +613,6 @@ lamarc_SOURCES  =   $(lamarcgcov_sources
+ 					$(lamarc_resources) \
+ 					$(config_sources)
+ 
+-lamarc_LDADD	= libtinyxml.a
+-
+ old_lam_conv_core       = \
+ 			src/conversion/ConverterIf.cpp \
+ 			src/conversion/Converter_ConverterIf.h \
+@@ -942,9 +919,9 @@ lam_conv_SOURCES        = \
+ 			$(lam_conv_core) \
+ 			$(lam_conv_resources)
+ 
+-lam_conv_LDADD = @WX_LIBS@ -lX11 libtinyxml.a
++lam_conv_LDADD = @WX_LIBS@ -lX11 -ltinyxml
+ 
+-EXTRA_lam_conv_SOURCES  = $(tinyxml_suite) $(lam_conv_icons)
++EXTRA_lam_conv_SOURCES  = $(lam_conv_icons)
+ 
+ batch_lam_conv_core     = \
+ 			src/guiconv/batchconverter.h \
+@@ -961,9 +938,7 @@ batch_lam_conv_testable = \
+ batch_lam_conv_SOURCES	=	\
+ 			$(batch_lam_conv_testable)
+ 
+-batch_lam_conv_LDADD = @WX_LIBS@ -lX11 libtinyxml.a
+-
+-EXTRA_batch_lam_conv_SOURCES = $(tinyxml_suite)
++batch_lam_conv_LDADD = @WX_LIBS@ -lX11 -ltinyxml
+ 
+ ## ############################################################
+ ## To make OSX executables for wxWindows stuff
+@@ -1191,7 +1166,6 @@ EXTRA_DIST                      = \
+ 			Makefile.am \
+ 			configure.ac \
+ 			boost \
+-			tinyxml \
+ 			$(license_info) \
+ 			$(wx_curr) \
+ 			$(scripts_to_dist) \
+@@ -1217,7 +1191,6 @@ EXTRA_DIST                      = \
+ 
+ dist-hook:
+ 	rm -rf `find $(distdir)/boost -name CVS`
+-	rm -rf `find $(distdir)/tinyxml -name CVS`
+ 
+ ## ############################################################
+ ## support for sanity checks

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/lamarc.git