More changes after fparser is not bundled anymore

4 files changed, 3 insertions, 78 deletions

diff --git a/debian/README.source b/debian/README.source
index 97152d1..27d9f50 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1 @@
-libfparser is currently bundled in the openEMS source package, but built as a
-separate binary package. The binary version of the package is overridden with
-"dh_gencontrol -- -v". The library is very small and there is not much activity
-upstream.
-
-Later, if deemed convenient, this package may be split into a separate source
-package.
+The embedded library fparser has been removed from the source package.
diff --git a/debian/control b/debian/control
index 256907c..0a14d0d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9),
                libcgal-qt5-dev,
                libtinyxml-dev,
                libvtk6-qt-dev,
+               libfparser-dev,
                dh-octave,
                chrpath,
                txt2man
@@ -26,7 +27,6 @@ Depends: ${shlibs:Depends},
          libopenems0 (= ${binary:Version}),
          libcsxcad0 (= ${binary:Version}),
          libqcsxcad0 (= ${binary:Version}),
-         libfparser4 (= ${fparser-version-full}),
          libnf2ff0 (= ${binary:Version})
 Recommends: octave-openems
 Description: Electromagnetic simulator
@@ -78,39 +78,6 @@ Description: QT Gui Library for Visualization of Continuous Structure XML
  openEMS is a simulator for electromagnetic problems using
  the FDTD algorithm.
 
-Package: libfparser4
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Function Parser for C++
- This C++ library offers a class which can be used to parse and evaluate a
- mathematical function from a string (which might be eg. requested from the
- user).
- .
- The syntax of the function string is similar to mathematical expressions
- written in C/C++ (the exact syntax is specified in the documentation below).
- The function can then be evaluated with different values of variables.
-
-Package: libfparser-dev
-Architecture: any
-Section: libdevel
-Depends: ${misc:Depends},
-         libfparser4 (= ${fparser-version-full})
-Multi-Arch: same
-Description: Function Parser for C++ - development files
- This C++ library offers a class which can be used to parse and evaluate a
- mathematical function from a string (which might be eg. requested from the
- user).
- .
- The syntax of the function string is similar to mathematical expressions
- written in C/C++ (the exact syntax is specified in the documentation below).
- The function can then be evaluated with different values of variables.
- .
- This package contains the development files for this library.
-
 Package: libnf2ff0
 Architecture: any
 Section: libs
@@ -135,7 +102,7 @@ Depends: ${misc:Depends},
          libcsxcad0 (= ${binary:Version}),
          libqcsxcad0 (= ${binary:Version}),
          libnf2ff0 (= ${binary:Version}),
-         libfparser-dev (= ${fparser-version-full})
+         libfparser-dev
 Multi-Arch: same
 Description: Development files for openems
  This package contains the development files for all
diff --git a/debian/copyright b/debian/copyright
index 423822c..4ef6d8b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,11 +7,6 @@ Files: *
 Copyright: 2010-2016 Thorsten Liebig <Thorsten.Liebig@gmx.de>
 License: GPL-3+
 
-Files: fparser/*
-Copyright: 2003-2011 Juha Nieminen
-           2003-2011 Joel Yliluoma
-License: LGPL-3
-
 Files: debian/*
 Copyright: 2016 Ruben Undheim <ruben.undheim@gmail.com>
 License: GPL-3+
@@ -33,23 +28,3 @@ License: GPL-3+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-
-License: LGPL-3
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; version 3
- of the License.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian Systems, the full text of the license can be found on
- /usr/share/common-licenses/LGPL-3
diff --git a/debian/rules b/debian/rules
index 4f5c616..ba6c9fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,6 @@ OCTAVE_HOSTTYPE = $(shell octave-config -p CANONICAL_HOST_TYPE)
 OCTAVE_API_VERSION = $(shell octave-config -p API_VERSION)
 OCTAVE_FULLBPATH = $(OCTAVE_BPATH)/openEMS-$(DEB_VERSION_EPOCH_UPSTREAM)/$(OCTAVE_HOSTTYPE)-$(OCTAVE_API_VERSION)
 
-FPARSER_VERSION=4.5.1
-FPARSER_VERSION_FULL = $(FPARSER_VERSION)-$(DEBIAN_VERSION_SUFFIX)
-SUBSTVARS = -Vfparser-version-full="$(FPARSER_VERSION_FULL)"
-
 %:
 	dh $@
 
@@ -34,7 +30,6 @@ override_dh_auto_configure:
 override_dh_auto_build:
 
 override_dh_auto_install:
-	cd fparser && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
 	cd CSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
 	cd QCSXCAD && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .. && make && make install DESTDIR=../../debian/tmp
 	cd openEMS && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../../debian/tmp/usr -DCSXCAD_ROOT_DIR=../../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) ..
@@ -56,7 +51,6 @@ override_dh_auto_install:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	$(RM) -r fparser/build || true
 	$(RM) -r CSXCAD/build || true
 	$(RM) -r QCSXCAD/build || true
 	$(RM) -r openEMS/build || true
@@ -66,8 +60,3 @@ override_dh_auto_clean:
 override_dh_installman:
 	cd debian/man ; CHANGELOG_DATE="$(CHANGELOG_DATE)" ./genmanpages.sh
 	dh_installman
-
-override_dh_gencontrol:
-	dh_gencontrol -- $(SUBSTVARS)
-	dh_gencontrol -plibfparser4 -- -v$(FPARSER_VERSION_FULL) $(SUBSTVARS)
-	dh_gencontrol -plibfparser-dev -- -v$(FPARSER_VERSION_FULL) $(SUBSTVARS)