[magics] 19/31: Test adding libdrivers.a to libMagQt

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jun 12 11:09:48 UTC 2015


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

mckinstry pushed a commit to branch master
in repository magics.

commit 29c11ef3143e3d7068aab48f745ac998c3c83a22
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Dec 14 10:21:09 2013 +0000

    Test adding libdrivers.a to libMagQt
---
 debian/patches/metview_fixes.patch | 12 ++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 13 insertions(+)

diff --git a/debian/patches/metview_fixes.patch b/debian/patches/metview_fixes.patch
new file mode 100644
index 0000000..bff0589
--- /dev/null
+++ b/debian/patches/metview_fixes.patch
@@ -0,0 +1,12 @@
+Index: magics++-2.18.15/src/drivers/Makefile.am
+===================================================================
+--- magics++-2.18.15.orig/src/drivers/Makefile.am	2013-12-13 03:23:14.000000000 +0000
++++ magics++-2.18.15/src/drivers/Makefile.am	2013-12-14 10:15:46.000000000 +0000
+@@ -99,6 +99,7 @@
+ libMagPlusQt_la_LDFLAGS		= $(QT_LIBS) -version-info $(MAGICS_LIBRARY_CURRENT):$(MAGICS_LIBRARY_REVISION):$(MAGICS_LIBRARY_AGE)
+ libMagPlusQt_la_SOURCES		= $(QT_la_S)
+ AM_CPPFLAGS 			+= -I$(METVIEW_HOME)/src/libUtil -I$(top_srcdir)/src/drivers/MgQ $(QT_CPPFLAGS)
++libMagPlusQt_la_LIBADD		+= libdrivers.la
+ endif
+ 
+ BUILT_SOURCES	= $(QT_la_built)
diff --git a/debian/patches/series b/debian/patches/series
index cc66b4c..3408824 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+metview_fixes.patch
 dynamic_link.patch
 cve-2010-3393.patch
 terralib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git



More information about the debian-science-commits mailing list