[openems] 02/02: Patch path to binaries Install octave files as "proper" octave packages
Ruben Undheim
rubund-guest at moszumanska.debian.org
Wed Jul 6 16:36:11 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 f8a502c57256b3f7ce98addd134a7eaf602dfbce
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Wed Jul 6 18:24:30 2016 +0200
Patch path to binaries
Install octave files as "proper" octave packages
---
debian/CSXCAD.packinfo/DESCRIPTION | 7 ++
debian/CSXCAD.packinfo/INDEX | 1 +
debian/CSXCAD.packinfo/NEWS | 1 +
debian/octave-openems.install | 2 +
debian/openEMS.packinfo/DESCRIPTION | 7 ++
debian/openEMS.packinfo/INDEX | 1 +
debian/openEMS.packinfo/NEWS | 1 +
.../0001-Fix-path-to-binaries-for-Debian.patch | 90 ++++++++++++++++++++++
debian/patches/series | 1 +
9 files changed, 111 insertions(+)
diff --git a/debian/CSXCAD.packinfo/DESCRIPTION b/debian/CSXCAD.packinfo/DESCRIPTION
new file mode 100644
index 0000000..5525ace
--- /dev/null
+++ b/debian/CSXCAD.packinfo/DESCRIPTION
@@ -0,0 +1,7 @@
+Name: CSXCAD
+Version: 0.0.34
+Date: 2016-07-06
+Author: various authors
+Maintainer: Ruben Undheim <ruben.undheim at gmail.com>
+Title: Electromagnetic field solver
+Description: Signal processing tools, including filtering, windowing and display functions.
diff --git a/debian/CSXCAD.packinfo/INDEX b/debian/CSXCAD.packinfo/INDEX
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/CSXCAD.packinfo/INDEX
@@ -0,0 +1 @@
+
diff --git a/debian/CSXCAD.packinfo/NEWS b/debian/CSXCAD.packinfo/NEWS
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/CSXCAD.packinfo/NEWS
@@ -0,0 +1 @@
+
diff --git a/debian/octave-openems.install b/debian/octave-openems.install
index e5f5550..f53d8df 100644
--- a/debian/octave-openems.install
+++ b/debian/octave-openems.install
@@ -1,2 +1,4 @@
usr/share/openEMS/matlab/* /usr/share/octave/packages/openEMS-0.0.34/
usr/share/CSXCAD/matlab/* /usr/share/octave/packages/CSXCAD-0.0.34/
+debian/openEMS.packinfo/* /usr/share/octave/packages/openEMS-0.0.34/packinfo/
+debian/CSXCAD.packinfo/* /usr/share/octave/packages/CSXCAD-0.0.34/packinfo/
diff --git a/debian/openEMS.packinfo/DESCRIPTION b/debian/openEMS.packinfo/DESCRIPTION
new file mode 100644
index 0000000..2e3be88
--- /dev/null
+++ b/debian/openEMS.packinfo/DESCRIPTION
@@ -0,0 +1,7 @@
+Name: openEMS
+Version: 0.0.34
+Date: 2016-07-06
+Author: various authors
+Maintainer: Ruben Undheim <ruben.undheim at gmail.com>
+Title: Electromagnetic field solver
+Description: Signal processing tools, including filtering, windowing and display functions.
diff --git a/debian/openEMS.packinfo/INDEX b/debian/openEMS.packinfo/INDEX
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/openEMS.packinfo/INDEX
@@ -0,0 +1 @@
+
diff --git a/debian/openEMS.packinfo/NEWS b/debian/openEMS.packinfo/NEWS
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/debian/openEMS.packinfo/NEWS
@@ -0,0 +1 @@
+
diff --git a/debian/patches/0001-Fix-path-to-binaries-for-Debian.patch b/debian/patches/0001-Fix-path-to-binaries-for-Debian.patch
new file mode 100644
index 0000000..542589b
--- /dev/null
+++ b/debian/patches/0001-Fix-path-to-binaries-for-Debian.patch
@@ -0,0 +1,90 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Wed, 6 Jul 2016 18:24:09 +0200
+Subject: Fix path to binaries for Debian
+
+---
+ CSXCAD/matlab/CSXGeomPlot.m | 16 +++++++++-------
+ openEMS/matlab/CalcNF2FF.m | 15 ++++++++-------
+ openEMS/matlab/private/invoke_openEMS.m | 16 +++++++++-------
+ 3 files changed, 26 insertions(+), 21 deletions(-)
+
+diff --git a/CSXCAD/matlab/CSXGeomPlot.m b/CSXCAD/matlab/CSXGeomPlot.m
+index df33c94..034f1a1 100644
+--- a/CSXCAD/matlab/CSXGeomPlot.m
++++ b/CSXCAD/matlab/CSXGeomPlot.m
+@@ -27,13 +27,15 @@ end
+ filename = mfilename('fullpath');
+ dir = fileparts( filename );
+
+-if isunix
+- AppCSXCAD_bin = searchBinary('AppCSXCAD.sh', ...
+- {[dir filesep '..' filesep '..' filesep 'AppCSXCAD' filesep], ...
+- [dir filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]});
+-else % assume windows
+- AppCSXCAD_bin = searchBinary('AppCSXCAD.exe',[dir filesep '..' filesep]);
+-end
++%if isunix
++% AppCSXCAD_bin = searchBinary('AppCSXCAD.sh', ...
++% {[dir filesep '..' filesep '..' filesep 'AppCSXCAD' filesep], ...
++% [dir filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]});
++%else % assume windows
++% AppCSXCAD_bin = searchBinary('AppCSXCAD.exe',[dir filesep '..' filesep]);
++%end
++
++AppCSXCAD_bin = '/usr/bin/AppCSXCAD';
+
+ command = [AppCSXCAD_bin ' --disableEdit ' args_string ' ' CSX_filename];
+ disp( ['invoking AppCSXCAD, exit to continue script...'] );
+diff --git a/openEMS/matlab/CalcNF2FF.m b/openEMS/matlab/CalcNF2FF.m
+index c80b52e..07cc849 100644
+--- a/openEMS/matlab/CalcNF2FF.m
++++ b/openEMS/matlab/CalcNF2FF.m
+@@ -98,13 +98,14 @@ struct_2_xml(nf2ff.xml,nf2ff_xml,'nf2ff');
+ m_filename = mfilename('fullpath');
+ dir_name = fileparts( m_filename );
+
+-if isunix
+- nf2ff_bin = searchBinary('nf2ff', ...
+- {[dir_name filesep '..' filesep 'nf2ff' filesep], ...
+- [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0);
+-else
+- nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0);
+-end
++%if isunix
++% nf2ff_bin = searchBinary('nf2ff', ...
++% {[dir_name filesep '..' filesep 'nf2ff' filesep], ...
++% [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0);
++%else
++% nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0);
++%end
++nf2ff_bin = '/usr/bin/nf2ff';
+
+ if ((exist(nf2ff.hdf5,'file') && (mode==0)) || (mode==2))
+ disp('CalcNF2FF: Reading nf2ff data only...')
+diff --git a/openEMS/matlab/private/invoke_openEMS.m b/openEMS/matlab/private/invoke_openEMS.m
+index afb2b46..8c4d79b 100644
+--- a/openEMS/matlab/private/invoke_openEMS.m
++++ b/openEMS/matlab/private/invoke_openEMS.m
+@@ -26,13 +26,15 @@ end
+ filename = mfilename('fullpath');
+ dir = fileparts( filename );
+
+-if isunix
+- openEMS_bin = searchBinary('openEMS.sh', ...
+- {[dir filesep '..' filesep '..' filesep], ... % try devel path
+- [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path
+-else % assume windows
+- openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]);
+-end
++%if isunix
++% openEMS_bin = searchBinary('openEMS.sh', ...
++% {[dir filesep '..' filesep '..' filesep], ... % try devel path
++% [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path
++%else % assume windows
++% openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]);
++%end
++
++openEMS_bin = '/usr/bin/openEMS';
+
+ command = [openEMS_bin ' ' opts];
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..13a22f7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-path-to-binaries-for-Debian.patch
--
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