[saga] 01/02: Use debian version of libdxf

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository saga.

commit 044d6724ec4726368771532cc977897ca4d28842
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Wed Apr 6 14:24:56 2016 +0200

    Use debian version of libdxf
---
 debian/changelog                               |  1 +
 debian/control                                 |  3 +-
 debian/control.in                              |  3 +-
 debian/patches/Use-debian-version-dxflib.patch | 54 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 5 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84b9e7f..4dbd736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ saga (2.2.6+dfsg-1) UNRELEASED; urgency=medium
 
   [ Johan Van de Wauw ]
   * Add transitional libsaga package
+  * Use debian version of libdxf
 
  -- Johan Van de Wauw <johan at vandewauw.be>  Fri, 04 Mar 2016 17:34:50 +0100
 
diff --git a/debian/control b/debian/control
index 9d8a1d9..1d52c80 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Build-Depends: libwxgtk3.0-dev,
                libopencv-contrib-dev,
                libopencv-imgproc-dev,
                libopencv-legacy-dev,
-               libopencv-photo-dev
+               libopencv-photo-dev,
+               libdxflib-dev
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/saga.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/saga.git
diff --git a/debian/control.in b/debian/control.in
index 9ac8cc5..e933617 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,7 +23,8 @@ Build-Depends: libwxgtk3.0-dev,
                libopencv-contrib-dev,
                libopencv-imgproc-dev,
                libopencv-legacy-dev,
-               libopencv-photo-dev
+               libopencv-photo-dev,
+               libdxflib-dev
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/saga.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/saga.git
diff --git a/debian/patches/Use-debian-version-dxflib.patch b/debian/patches/Use-debian-version-dxflib.patch
new file mode 100644
index 0000000..1be5e43
--- /dev/null
+++ b/debian/patches/Use-debian-version-dxflib.patch
@@ -0,0 +1,54 @@
+Description: Use debian version of dxflib
+Author: Johan Van de Wauw <johan at vandewauw.be>
+--- a/src/modules/io/io_shapes_dxf/Makefile.am
++++ b/src/modules/io/io_shapes_dxf/Makefile.am
+@@ -8,25 +8,13 @@
+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
+ CXX_INCS           = -I$(top_srcdir)/src/saga_core
+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
+-AM_LDFLAGS         = -fPIC -shared -avoid-version 
++AM_LDFLAGS         = -fPIC -shared -avoid-version -ldxflib
+ pkglib_LTLIBRARIES = libio_shapes_dxf.la
+ libio_shapes_dxf_la_SOURCES =\
+ dxf_import.cpp\
+ MLB_Interface.cpp\
+-./dxflib/dl_dxf.cpp\
+-./dxflib/dl_writer_ascii.cpp\
+ dxf_import.h\
+-MLB_Interface.h\
+-./dxflib/dl_attributes.h\
+-./dxflib/dl_codes.h\
+-./dxflib/dl_creationadapter.h\
+-./dxflib/dl_creationinterface.h\
+-./dxflib/dl_dxf.h\
+-./dxflib/dl_entities.h\
+-./dxflib/dl_exception.h\
+-./dxflib/dl_extrusion.h\
+-./dxflib/dl_writer.h\
+-./dxflib/dl_writer_ascii.h
++MLB_Interface.h
+ 
+ libio_shapes_dxf_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la $(ADD_MLBS)
+ 
+--- a/src/modules/io/io_shapes_dxf/dxf_import.cpp
++++ b/src/modules/io/io_shapes_dxf/dxf_import.cpp
+@@ -63,7 +63,7 @@
+ //---------------------------------------------------------
+ #include "dxf_import.h"
+ 
+-#include "./dxflib/dl_dxf.h"
++#include <dxflib/dl_dxf.h>
+ 
+ 
+ ///////////////////////////////////////////////////////////
+--- a/src/modules/io/io_shapes_dxf/dxf_import.h
++++ b/src/modules/io/io_shapes_dxf/dxf_import.h
+@@ -74,7 +74,7 @@
+ //---------------------------------------------------------
+ #include "MLB_Interface.h"
+ 
+-#include "./dxflib/dl_creationadapter.h"
++#include <dxflib/dl_creationadapter.h>
+ 
+ 
+ ///////////////////////////////////////////////////////////
diff --git a/debian/patches/series b/debian/patches/series
index 6eeda72..f57999a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Use-debian-version-of-libsvm.patch
 0001-vigra-hdf5-include.patch
+Use-debian-version-dxflib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git