[openems] 01/01: Fixed many lintians
Ruben Undheim
rubund-guest at moszumanska.debian.org
Mon Nov 21 00:13:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository openems.
commit c3260513cc6c94bebdb6a7f357d04781519c957d
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Mon Nov 21 00:08:35 2016 +0100
Fixed many lintians
- Delete CVS dir (lintian)
- standards version updated
- Fix long descriptions
- Don't install sh files
- binary dependencies for octave-openems
- Set build type to Debug so that debug symbols can be stripped after build
- Touch timestamp in changelog
- Don't exit from library
- Added shlibs files
---
debian/changelog | 2 +-
debian/control | 60 +++++++++++++++---
debian/libcsxcad0.shlibs | 1 +
debian/libfparser4.shlibs | 1 +
debian/libnf2ff0.shlibs | 1 +
debian/libopenems0.shlibs | 1 +
debian/libqcsxcad0.shlibs | 1 +
debian/openems.install | 5 +-
debian/patches/0005-Deletede-CVS-dir-lintian.patch | 73 ++++++++++++++++++++++
debian/patches/0006-Don-t-exit-from-library.patch | 57 +++++++++++++++++
debian/patches/series | 2 +
debian/rules | 10 +--
12 files changed, 200 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index adb9988..804b9ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ openems (0.0.34-1) unstable; urgency=low
* Initial release (Closes: #830109)
- -- Ruben Undheim <ruben.undheim at gmail.com> Sat, 13 Dec 2014 12:38:34 +0100
+ -- Ruben Undheim <ruben.undheim at gmail.com> Mon, 21 Nov 2016 00:31:25 +0100
diff --git a/debian/control b/debian/control
index e3536c9..9daaa6b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
libqt4-dev,
libvtk6-qt-dev,
octave-pkg-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/openems.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/openems.git
Homepage: http://openems.de
@@ -29,6 +29,11 @@ Depends: ${shlibs:Depends},
libnf2ff0 (= ${binary:Version})
Recommends: octave-openems
Description: Electromagnetic simulator
+ This is a simulator for electromagnetic problems using the FDTD
+ (Finite-difference time-domain method) algorithm.
+ .
+ The FDTD algorithm is a popular algorithm for solving electromagnetic problems
+ in the time domain.
Package: libopenems0
Architecture: any
@@ -37,7 +42,11 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: Libraries for openems
+Description: Library for the electromagnetic simulator using the FDTD method
+ The finite difference time domain method is a popular numerical algorithm
+ for solving electromagnetic problems.
+ .
+ This package contains the library used by openEMS.
Package: libcsxcad0
Architecture: any
@@ -46,7 +55,12 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: Libraries for openems
+Description: Continuous Structure XML library for openEMS
+ A C++ library to describe geometrical objects and their physical or
+ non-physical properties.
+ .
+ openEMS is a simulator for electromagnetic problems using
+ the FDTD algorithm.
Package: libqcsxcad0
Architecture: any
@@ -55,7 +69,13 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: Libraries for openems
+Description: QT Gui Library for Visualization of Continuous Structure XML
+ Continuous structure XML (libcsxcad) is a way to describe geometrical objects
+ and their physical or non-physical properties. This library provides
+ functions to show this in a GUI.
+ .
+ openEMS is a simulator for electromagnetic problems using
+ the FDTD algorithm.
Package: libfparser4
Architecture: any
@@ -64,7 +84,14 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: Libraries for openems
+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: libnf2ff0
Architecture: any
@@ -73,7 +100,14 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: Libraries for openems
+Description: Near-field to far-field transform library
+ This is a library for the near-field to far-field transform used
+ by openEMS.
+ .
+ It is needed by the nf2ff utility.
+ .
+ openEMS is a simulator for electromagnetic problems using
+ the FDTD algorithm.
Package: libopenems-dev
Architecture: any
@@ -86,12 +120,24 @@ Depends: ${misc:Depends},
libnf2ff0 (= ${binary:Version})
Multi-Arch: same
Description: Development files for openems
+ This package contains the development files for all
+ the libraries provided by openEMS.
+ .
+ openEMS is a simulator for electromagnetic problems using
+ the FDTD algorithm.
Package: octave-openems
Architecture: any
-Depends: ${misc:Depends},
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
openems,
octave,
epstool,
transfig
Description: Octave interface for openems
+ This package contains the octave-files needed for
+ openEMS. The are installed such that they can be used
+ after running "pkg load openems" or "pkg load csxcad".
+ .
+ openEMS is a simulator for electromagnetic problems using
+ the FDTD algorithm.
diff --git a/debian/libcsxcad0.shlibs b/debian/libcsxcad0.shlibs
new file mode 100644
index 0000000..d1cd130
--- /dev/null
+++ b/debian/libcsxcad0.shlibs
@@ -0,0 +1 @@
+libCSXCAD 0 libcsxcad0
diff --git a/debian/libfparser4.shlibs b/debian/libfparser4.shlibs
new file mode 100644
index 0000000..8e5cadb
--- /dev/null
+++ b/debian/libfparser4.shlibs
@@ -0,0 +1 @@
+libfparser 4 libfparser4
diff --git a/debian/libnf2ff0.shlibs b/debian/libnf2ff0.shlibs
new file mode 100644
index 0000000..f919eb6
--- /dev/null
+++ b/debian/libnf2ff0.shlibs
@@ -0,0 +1 @@
+libnf2ff 0 libnf2ff0
diff --git a/debian/libopenems0.shlibs b/debian/libopenems0.shlibs
new file mode 100644
index 0000000..d2fd3b9
--- /dev/null
+++ b/debian/libopenems0.shlibs
@@ -0,0 +1 @@
+libopenEMS 0 libopenems0
diff --git a/debian/libqcsxcad0.shlibs b/debian/libqcsxcad0.shlibs
new file mode 100644
index 0000000..eaf208a
--- /dev/null
+++ b/debian/libqcsxcad0.shlibs
@@ -0,0 +1 @@
+libQCSXCAD 0 libqcsxcad0
diff --git a/debian/openems.install b/debian/openems.install
index e772481..bc989c1 100644
--- a/debian/openems.install
+++ b/debian/openems.install
@@ -1 +1,4 @@
-usr/bin
+#usr/bin
+usr/bin/AppCSXCAD
+usr/bin/nf2ff
+usr/bin/openEMS
diff --git a/debian/patches/0005-Deletede-CVS-dir-lintian.patch b/debian/patches/0005-Deletede-CVS-dir-lintian.patch
new file mode 100644
index 0000000..78a91e4
--- /dev/null
+++ b/debian/patches/0005-Deletede-CVS-dir-lintian.patch
@@ -0,0 +1,73 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Mon, 21 Nov 2016 00:08:20 +0100
+Subject: Deletede CVS dir (lintian)
+
+---
+ QCSXCAD/images/CVS/Entries | 40 ----------------------------------------
+ QCSXCAD/images/CVS/Repository | 1 -
+ QCSXCAD/images/CVS/Root | 1 -
+ 3 files changed, 42 deletions(-)
+ delete mode 100644 QCSXCAD/images/CVS/Entries
+ delete mode 100644 QCSXCAD/images/CVS/Repository
+ delete mode 100644 QCSXCAD/images/CVS/Root
+
+diff --git a/QCSXCAD/images/CVS/Entries b/QCSXCAD/images/CVS/Entries
+deleted file mode 100644
+index 3593808..0000000
+--- a/QCSXCAD/images/CVS/Entries
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/GeoEdit.png/1.1/Mon Oct 20 07:11:47 2003/-kb/
+-/ParaSetup.png/1.1/Mon Oct 20 07:11:13 2003/-kb/
+-/Thumbs.db/1.2/Tue Jun 27 14:51:16 2006/-kb/
+-/accept.png/1.1/Mon Aug 29 14:17:00 2005/-kb/
+-/bulb.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/bulb_off.png/1.1/Wed Oct 11 20:48:27 2006/-kb/
+-/cancel.png/1.1/Mon Oct 20 07:16:21 2003/-kb/
+-/close.png/1.1/Mon Oct 20 07:16:25 2003/-kb/
+-/configure.png/1.1/Mon Oct 10 19:03:03 2005/-kb/
+-/down.png/1.1/Mon Oct 10 19:03:03 2005/-kb/
+-/edit.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/edit_add.png/1.1/Mon Oct 20 07:16:24 2003/-kb/
+-/edit_remove.png/1.1/Mon Oct 20 07:16:25 2003/-kb/
+-/editcopy.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/exit.png/1.1/Mon Oct 20 07:16:26 2003/-kb/
+-/failed.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/filenew.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/fileopen.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/filesave.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/filesaveas.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/folder.png/1.1/Fri Apr 4 12:47:44 2003/-kb/
+-/funct.png/1.1/Mon Oct 20 07:16:30 2003/-kb/
+-/hourglass.png/1.1/Wed Sep 28 17:56:00 2005/-kb/
+-/icon.gif/1.1/Sun Aug 28 21:13:00 2005/-kb/
+-/launch.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/qt-logo.png/1.1/Wed Dec 14 17:02:26 2005/-kb/
+-/reload.png/1.1/Mon Dec 16 23:41:14 2002/-kb/
+-/result_small.png/1.1/Mon Oct 20 07:16:29 2003/-kb/
+-/results.png/1.1/Mon Oct 20 07:11:58 2003/-kb/
+-/setup.png/1.1/Sun Aug 14 17:45:15 2005/-kb/
+-/simulation.png/1.1/Fri Jan 6 12:43:58 2006/-kb/
+-/simulation_icon.png/1.1/Fri Jan 6 14:24:45 2006/-kb/
+-/simulation_small.png/1.1/Thu Jun 29 20:43:26 2006/-kb/
+-/simulation_tr.png/1.1/Fri Jan 6 14:23:52 2006/-kb/
+-/up.png/1.1/Mon Oct 10 19:03:03 2005/-kb/
+-/viewmag+.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/viewmag-.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/viewmagfit.png/1.1/Fri Apr 4 12:47:42 2003/-kb/
+-/window_icon2.png/1.1/Mon Aug 29 14:17:00 2005/-kb/
+-/work.png/1.1/Mon Oct 20 07:14:09 2003/-kb/
+diff --git a/QCSXCAD/images/CVS/Repository b/QCSXCAD/images/CVS/Repository
+deleted file mode 100644
+index d336c21..0000000
+--- a/QCSXCAD/images/CVS/Repository
++++ /dev/null
+@@ -1 +0,0 @@
+-StaticSimulator/images
+diff --git a/QCSXCAD/images/CVS/Root b/QCSXCAD/images/CVS/Root
+deleted file mode 100644
+index 800d2fc..0000000
+--- a/QCSXCAD/images/CVS/Root
++++ /dev/null
+@@ -1 +0,0 @@
+-:extssh:coft at atex.ate.uni-duisburg.de:/srv/CVS
diff --git a/debian/patches/0006-Don-t-exit-from-library.patch b/debian/patches/0006-Don-t-exit-from-library.patch
new file mode 100644
index 0000000..7c95eb5
--- /dev/null
+++ b/debian/patches/0006-Don-t-exit-from-library.patch
@@ -0,0 +1,57 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Mon, 21 Nov 2016 00:45:35 +0100
+Subject: Don't exit from library
+
+---
+ openEMS/tools/array_ops.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/openEMS/tools/array_ops.cpp b/openEMS/tools/array_ops.cpp
+index 8710b3c..7100f9a 100644
+--- a/openEMS/tools/array_ops.cpp
++++ b/openEMS/tools/array_ops.cpp
+@@ -73,7 +73,7 @@ f4vector* Create1DArray_v4sf(const unsigned int numLines)
+ if (MEMALIGN( (void**)&array, 16, sizeof(typeof(f4vector))*numLines ))
+ {
+ cerr << "cannot allocate aligned memory" << endl;
+- exit(3);
++ return 0;
+ }
+ for (unsigned int pos=0; pos<numLines; ++pos)
+ {
+@@ -95,7 +95,7 @@ f4vector*** Create3DArray_v4sf(const unsigned int* numLines)
+ if (MEMALIGN( (void**)&array, 16, sizeof(typeof(f4vector**))*numLines[0] ))
+ {
+ cerr << "cannot allocate aligned memory" << endl;
+- exit(3);
++ return 0;
+ }
+ //array = new f4vector**[numLines[0]];
+ for (pos[0]=0; pos[0]<numLines[0]; ++pos[0])
+@@ -103,7 +103,7 @@ f4vector*** Create3DArray_v4sf(const unsigned int* numLines)
+ if (MEMALIGN( (void**)&array[pos[0]], 16, sizeof(typeof(f4vector*))*numLines[1] ))
+ {
+ cerr << "cannot allocate aligned memory" << endl;
+- exit(3);
++ return 0;
+ }
+ //array[pos[0]] = new f4vector*[numLines[1]];
+ for (pos[1]=0; pos[1]<numLines[1]; ++pos[1])
+@@ -111,7 +111,7 @@ f4vector*** Create3DArray_v4sf(const unsigned int* numLines)
+ if (MEMALIGN( (void**)&array[pos[0]][pos[1]], 16, sizeof(typeof(f4vector))*numZ ))
+ {
+ cerr << "cannot allocate aligned memory" << endl;
+- exit(3);
++ return 0;
+ }
+ //array[pos[0]][pos[1]] = new f4vector[numZ];
+ for (pos[2]=0; pos[2]<numZ; ++pos[2])
+@@ -132,7 +132,7 @@ f4vector**** Create_N_3DArray_v4sf(const unsigned int* numLines)
+ if (MEMALIGN( (void**)&array, 16, sizeof(typeof(f4vector***))*3 ))
+ {
+ cerr << "cannot allocate aligned memory" << endl;
+- exit(3);
++ return 0;
+ }
+ //array = new f4vector***[3];
+ for (int n=0; n<3; ++n)
diff --git a/debian/patches/series b/debian/patches/series
index 1618142..6107a1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
0002-Spelling-fixes.patch
0003-More-things-to-fix-build.patch
0004-link-more.patch
+0005-Deletede-CVS-dir-lintian.patch
+0006-Don-t-exit-from-library.patch
diff --git a/debian/rules b/debian/rules
index 8251b4c..d8c9736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,13 @@ override_dh_auto_configure:
override_dh_auto_build:
override_dh_auto_install:
- cd fparser && cmake -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) . && make && make install DESTDIR=../debian/tmp
- cd CSXCAD && cmake -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) . && make && make install DESTDIR=../debian/tmp
- cd QCSXCAD && cmake -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 && cmake -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../debian/tmp/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .
+ cd fparser && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) . && make && make install DESTDIR=../debian/tmp
+ cd CSXCAD && 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 && 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 && 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) .
cd openEMS && make
cd openEMS && make install DESTDIR=../debian/tmp
- cd AppCSXCAD && cmake -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../debian/tmp/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DQCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .
+ cd AppCSXCAD && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DFPARSER_ROOT_DIR=../debian/tmp/usr -DCSXCAD_ROOT_DIR=../debian/tmp/usr -DQCSXCAD_ROOT_DIR=../debian/tmp/usr -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) .
cd AppCSXCAD && make
cd AppCSXCAD && make install DESTDIR=../debian/tmp
cd debian/tmp/usr/share/openEMS/matlab && CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" mkoctfile -lhdf5_cpp -DH5_USE_16_API h5readatt_octave.cc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openems.git
More information about the debian-science-commits
mailing list