[med-svn] [lamarc] 03/06: Fix patches

[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 6595dc60786b4f3c7873e6dda1ca5c8956012ec1
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jan 4 22:45:32 2018 +0100

    Fix patches
---
 debian/patches/use_debian_packaged_boost.patch   |  4 ++--
 debian/patches/use_debian_packaged_tinyxml.patch | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/patches/use_debian_packaged_boost.patch b/debian/patches/use_debian_packaged_boost.patch
index cb63d47..841214d 100644
--- a/debian/patches/use_debian_packaged_boost.patch
+++ b/debian/patches/use_debian_packaged_boost.patch
@@ -26,10 +26,10 @@ Description: Use Debian packaged boost
  			Makefile.am \
  			configure.ac \
 -			boost \
- 			tinyxml \
  			$(license_info) \
  			$(wx_curr) \
-@@ -1200,7 +1198,7 @@ EXTRA_DIST                      = \
+ 			$(scripts_to_dist) \
+@@ -1199,7 +1197,7 @@ EXTRA_DIST                      = \
  #                       $(vcprojdir)/lamarc.vcproj
  
  dist-hook:
diff --git a/debian/patches/use_debian_packaged_tinyxml.patch b/debian/patches/use_debian_packaged_tinyxml.patch
index 59a44b2..8f50cdf 100644
--- a/debian/patches/use_debian_packaged_tinyxml.patch
+++ b/debian/patches/use_debian_packaged_tinyxml.patch
@@ -56,7 +56,7 @@ Description: Use Debian packaged tinyxml
  					$(config_sources)
  
 -lamarc_LDADD	= libtinyxml.a
-+lamarc_LDADD	= ltinyxml
++lamarc_LDADD	= -ltinyxml
  
  old_lam_conv_core       = \
  			src/conversion/ConverterIf.cpp \
@@ -65,10 +65,10 @@ Description: Use Debian packaged tinyxml
  lam_conv_LDADD          = @WX_LIBS@
  if LAMARC_APP_OSX
 -   lam_conv_LDADD      += libtinyxml.a 
-+   lam_conv_LDADD      += linyxml 
++   lam_conv_LDADD      += -linyxml 
  else
 -   lam_conv_LDADD      += -lX11 libtinyxml.a 
-+   lam_conv_LDADD      += -lX11 ltinyxml 
++   lam_conv_LDADD      += -lX11 -ltinyxml 
  endif
  
 -EXTRA_lam_conv_SOURCES  = $(tinyxml_suite) $(lam_conv_icons)
@@ -85,3 +85,11 @@ Description: Use Debian packaged tinyxml
  ## ############################################################
  ## To make OSX executables for wxWindows stuff
  ## ############################################################
+@@ -1201,7 +1175,6 @@ EXTRA_DIST                      = \
+ 			Makefile.am \
+ 			configure.ac \
+ 			boost \
+-			tinyxml \
+ 			$(license_info) \
+ 			$(wx_curr) \
+ 			$(scripts_to_dist) \

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