diff options
-rw-r--r-- | debian/.gitignore | 5 | ||||
-rw-r--r-- | debian/changelog | 196 | ||||
-rw-r--r-- | debian/control | 25 | ||||
-rw-r--r-- | debian/copyright | 70 | ||||
-rw-r--r-- | debian/gbp.conf | 4 | ||||
-rw-r--r-- | debian/octave-instrument-control.doc-base | 12 | ||||
-rw-r--r-- | debian/octave-instrument-control.docs | 2 | ||||
-rw-r--r-- | debian/octave-instrument-control.info | 1 | ||||
-rw-r--r-- | debian/patches/add-info-dir.patch | 20 | ||||
-rw-r--r-- | debian/patches/series | 3 | ||||
-rw-r--r-- | debian/patches/xtest-in-unit-tests.patch | 129 | ||||
-rw-r--r-- | debian/patches/xtest-resolvehost.patch | 108 | ||||
-rwxr-xr-x | debian/rules | 10 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/source/lintian-overrides | 13 | ||||
-rw-r--r-- | debian/upstream/metadata | 7 | ||||
-rw-r--r-- | debian/watch | 3 |
17 files changed, 609 insertions, 0 deletions
diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..6825ff0 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,5 @@ +/.debhelper/ +/debhelper-build-stamp +/files +/octave-instrument-control.substvars +/octave-instrument-control/ diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ff39262 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,196 @@ +octave-instrument-control (0.9.2-1) unstable; urgency=medium + + * New upstream version 0.9.2 + * d/copyright: + + Reflect upstream changes + + Update Source URL + * Build and install the documentation + + d/control: Build-depend on texlive and dh-octave >= 1.7.0 + + d/octave-instrument-control.doc-base: New file + + d/octave-instrument-control.docs: New file + + d/octave-instrument-control.info: New file + + d/p/add-info-dir.patch: New patch + + d/rules: Add rule for building the docs + + d/s/lintian-overrides: Add override for source-is-missing + + -- Rafael Laboissière <rafael@debian.org> Sat, 06 Jan 2024 19:35:32 -0300 + +octave-instrument-control (0.9.1-1) unstable; urgency=medium + + * Upload to unstable + + * New upstream version 0.9.1 + * d/u/metadata: + + Update Bug-Database URL + + Add Changelog and Documentation URLs + + -- Rafael Laboissière <rafael@debian.org> Tue, 13 Jun 2023 17:54:10 -0300 + +octave-instrument-control (0.9.0-1) experimental; urgency=medium + + * New upstream version 0.9.0 + * d/copyright: Reflect upstream changes + * d/control: + + Update upstream Homepage URL + + Bump Standards-Version to 4.6.2 (no changes needed) + * Refresh patches for new upstream version: + + d/p/xtest-in-unit-tests.patch + + d/p/xtest-resolvehost.patch + + -- Rafael Laboissière <rafael@debian.org> Sat, 03 Jun 2023 05:14:58 -0300 + +octave-instrument-control (0.8.0-2) unstable; urgency=medium + + * d/watch: Adjust for new URL at gnu-octave.github.io + * d/s/lintian-override: Override Lintian warning + debian-watch-lacks-sourceforge-redirector + + -- Rafael Laboissière <rafael@debian.org> Mon, 05 Dec 2022 08:56:45 -0300 + +octave-instrument-control (0.8.0-1) unstable; urgency=medium + + * New upstream version 0.8.0 + * d/p/fix-realclean-and-distclean-rules.patch: Drop patch (applied upstream) + + -- Rafael Laboissière <rafael@debian.org> Sun, 24 Jul 2022 13:52:59 -0300 + +octave-instrument-control (0.7.1-2) unstable; urgency=medium + + * d/control: Bump Standards-Version to 4.6.1 (no changes needed) + * Build-depend on dh-sequence-octave + + d/control: Ditto + + d/rules: Drop the --with=octave option from dh call + * Proper cleaning of upsream files + + d/p/fix-realclean-and-distclean-rules.patch: New patch + + d/clean, d/s/options: Drop obsolete files + + d/control: Build-depend on dh-octave >= 1.2.3 + + -- Rafael Laboissière <rafael@debian.org> Mon, 11 Jul 2022 08:54:40 -0300 + +octave-instrument-control (0.7.1-1) unstable; urgency=medium + + * New upstream version 0.7.1 + * d/copyright: Reflect upstream changes + * d/p/honor-cflags.patch: Drop patch (applied upstream) + + -- Rafael Laboissière <rafael@debian.org> Sat, 22 Jan 2022 12:50:57 -0300 + +octave-instrument-control (0.7.0-3) unstable; urgency=medium + + * d/copyright: Accentuate my family name + * d/control: Bump Standards-Version to 4.6.0 (no changes needed) + * d/u/metadata: Add field Archive + * d/s/options: Avoid exclusion of Makefile.in files + * d/p/honor-cflags.patch: New patch + * d/p/xtest-resolvehost.patch: New patch + + -- Rafael Laboissière <rafael@debian.org> Sun, 14 Nov 2021 17:48:49 -0300 + +octave-instrument-control (0.7.0-2) unstable; urgency=medium + + * Upload to unstable + + -- Rafael Laboissière <rafael@debian.org> Mon, 16 Aug 2021 13:39:53 -0300 + +octave-instrument-control (0.7.0-1) experimental; urgency=medium + + * New upstream version 0.7.0 + * d/p/xtest-tcpclient.patch: Drop patch (not needed anymore) + * d/copyright: Reflect upstream changes + * d/control: Bump Standards-Version to 4.5.1 (no changes needed) + * d/clean: Clean automatically generated files + * d/u/metadata: Add Repository field + + -- Rafael Laboissière <rafael@debian.org> Sat, 27 Feb 2021 06:18:49 -0300 + +octave-instrument-control (0.6.0-2) unstable; urgency=medium + + * d/p/xtest-tcpclient.patch: New patch + * d/watch: Bump to version 4 + + -- Rafael Laboissière <rafael@debian.org> Tue, 17 Nov 2020 04:06:55 -0300 + +octave-instrument-control (0.6.0-1) unstable; urgency=medium + + * New upstream version 0.6.0 + * d/copyright: Reflect upstream changes + * d/p/xtest-in-unit-tests.patch: Refresh for new upstream version + * d/s/options: Ignore common.mk for upstream changes + + -- Rafael Laboissière <rafael@debian.org> Sat, 31 Oct 2020 04:02:35 -0300 + +octave-instrument-control (0.5.0-3) unstable; urgency=medium + + * d/p/xtest-in-unit-tests.patch: Set Forwarded:not-needed + + -- Rafael Laboissière <rafael@debian.org> Sat, 01 Aug 2020 02:57:05 -0300 + +octave-instrument-control (0.5.0-2) unstable; urgency=medium + + * d/control: Bump debhelper compatibitlity level to 13 + * d/u/metadata: Drop Name and Contact fields + * d/p/xtest-in-unit-tests.patch: Switch to xtest for tests involving + remote servers (Closes: #964211) + + -- Rafael Laboissière <rafael@debian.org> Mon, 13 Jul 2020 06:15:39 -0300 + +octave-instrument-control (0.5.0-1) unstable; urgency=medium + + * New upstream version 0.5.0 + * d/copyright: Reflect upstream changes + * d/p/xtest-in-unit-tests.patch: Refresh for new upstream version + * d/control: Bump Standards-Version to 4.5.0 (no changes needed) + * d/u/metadata: New file + * d/clean: New file + + -- Rafael Laboissière <rafael@debian.org> Wed, 15 Apr 2020 11:53:58 -0300 + +octave-instrument-control (0.4.0-4) unstable; urgency=medium + + * d/control: + + Bump Standards-Version to 4.4.1 (no changes needed) + + Bump dependency on dh-octave to >= 0.7.1 + This allows the injection of the virtual package octave-abi-N into + the package's list of dependencies. + + -- Rafael Laboissiere <rafael@debian.org> Tue, 05 Nov 2019 14:15:52 -0300 + +octave-instrument-control (0.4.0-3) unstable; urgency=medium + + [ Rafael Laboissiere ] + * Upload to unstable + * d/control: Bump Standards-Version to 4.4.0 (no changes needed) + + [ Sébastien Villemot ] + * d/copyright: use correct license short name (FSFAP) for Makefile + + -- Rafael Laboissiere <rafael@debian.org> Wed, 10 Jul 2019 05:15:53 -0300 + +octave-instrument-control (0.4.0-2) experimental; urgency=medium + + * d/p/xtest-in-unit-tests.patch: Ignore unit tests involding TCP/IP + + -- Rafael Laboissiere <rafael@debian.org> Sun, 12 May 2019 04:18:37 -0300 + +octave-instrument-control (0.4.0-1) experimental; urgency=medium + + * New upstream version 0.4.0 + * d/copyright: Reflect upstream changes + + -- Rafael Laboissiere <rafael@debian.org> Mon, 06 May 2019 11:08:29 -0300 + +octave-instrument-control (0.3.1-2) unstable; urgency=medium + + * d/control: + + Add Rules-Requires-Root: no + + Bump Standards-Version to 4.3.0 + + Bump to debhelper compat level 12 + * Build-depend on debhelper-compat instead of using d/compat + + -- Rafael Laboissiere <rafael@debian.org> Wed, 02 Jan 2019 22:56:05 -0200 + +octave-instrument-control (0.3.1-1) unstable; urgency=medium + + * Initial release (Closes: #899145) + + -- Rafael Laboissiere <rafael@debian.org> Sat, 30 Jun 2018 10:17:17 -0300 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..ec45287 --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: octave-instrument-control +Section: math +Priority: optional +Maintainer: Debian Octave Group <team+pkg-octave-team@tracker.debian.org> +Uploaders: Rafael Laboissière <rafael@debian.org> +Build-Depends: debhelper-compat (= 13), + dh-octave (>= 1.7.0), + dh-sequence-octave, + texlive +Standards-Version: 4.6.2 +Homepage: https://gnu-octave.github.io/packages/instrument-control/ +Vcs-Git: https://salsa.debian.org/pkg-octave-team/octave-instrument-control.git +Vcs-Browser: https://salsa.debian.org/pkg-octave-team/octave-instrument-control +Testsuite: autopkgtest-pkg-octave +Rules-Requires-Root: no + +Package: octave-instrument-control +Architecture: any +Depends: ${misc:Depends}, ${octave:Depends}, ${shlibs:Depends} +Description: instrument control for Octave + This package contains Low level input/output functions for serial, + i2c, parallel, tcp, gpib, vxi11 and usbtmc interfaces for use in + Octave, a scientific computation software. + . + This Octave add-on package is part of the Octave-Forge project. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..082796e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,70 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Instrument Control for Octave +Upstream-Contact: Stefan Mahr <dac922@gmx.de>, John Donoghue <john.donoghue@ieee.org> +Source: https://gnu-octave.github.io/packages/instrument-control/ + +Files: * +Copyright: 2012, 2014 Andrius Sutas <andrius.sutas@gmail.com> + 2013-2021 Stefan Mahr <dac922@gmx.de> + 2016 Andreas Weber <andy.weber.aw@gmail.com> + 2014, 2016-2024 John Donoghue <john.donoghue@ieee.org> +License: GPL-3+ + +Files: Makefile +Copyright: 2015-2016 Carnë Draug + 2015-2016 Oliver Heimlich + 2017 Julien Bect <jbect@users.sf.net> + 2017 Olaf Till <i7tiol@t-online.de> + 2018-2020 John Donoghue <john.donoghue@ieee.org> +License: FSFAP + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. This file is offered as-is, + without any warranty. + +Files: src/aclocal.m4 +Copyright: 2004 Scott James Remnant <scott@netsplit.com> + 2012-2015 Dan Nicholson <dbn.lists@gmail.com> +License: GPL-2+ with Autoconf exception + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at + your option) any later version. + . + This program 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 + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + . + As a special exception to the GNU General Public License, if you + distribute this file as part of a program that contains a + configuration script generated by Autoconf, you may include it under + the same distribution terms that you use for the rest of that + program. + +Files: debian/* +Copyright: 2018-2024 Rafael Laboissière <rafael@debian.org> +License: GPL-3+ + +License: GPL-3+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General Public + License, version 3, can be found in the file + `/usr/share/common-licenses/GPL-3'. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..6b65fe0 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,4 @@ +[DEFAULT] +debian-branch = debian/latest +upstream-branch = upstream/latest +pristine-tar = True diff --git a/debian/octave-instrument-control.doc-base b/debian/octave-instrument-control.doc-base new file mode 100644 index 0000000..eb8e53b --- /dev/null +++ b/debian/octave-instrument-control.doc-base @@ -0,0 +1,12 @@ +Document: octave-instrument-control-manual +Title: Octave Instrument Control Toolkit +Author: John Donoghue +Abstract: Documentation for the Instrument Control Package for GNU Octave +Section: Science/Mathematics + +Format: PDF +Files: /usr/share/doc/octave-instrument-control/instrument-control.pdf.gz + +Format: HTML +Files: /usr/share/doc/octave-instrument-control/instrument-control.html +Index: /usr/share/doc/octave-instrument-control/instrument-control.html diff --git a/debian/octave-instrument-control.docs b/debian/octave-instrument-control.docs new file mode 100644 index 0000000..abd888e --- /dev/null +++ b/debian/octave-instrument-control.docs @@ -0,0 +1,2 @@ +doc/instrument-control.html +doc/instrument-control.pdf diff --git a/debian/octave-instrument-control.info b/debian/octave-instrument-control.info new file mode 100644 index 0000000..0c226d8 --- /dev/null +++ b/debian/octave-instrument-control.info @@ -0,0 +1 @@ +doc/instrument-control.info diff --git a/debian/patches/add-info-dir.patch b/debian/patches/add-info-dir.patch new file mode 100644 index 0000000..d524d44 --- /dev/null +++ b/debian/patches/add-info-dir.patch @@ -0,0 +1,20 @@ +Description: Add direntry and dircategory for the info document +Author: Rafael Laboissière <rafael@debian.org> +Forwarded: nhttps://savannah.gnu.org/bugs/?65133 +Applied-Upstream: https://sourceforge.net/p/octave/instrument-control/ci/837d7beba9deeef6bd73af848948ee5b383e6827/ +Last-Update: 2024-01-06 + +--- octave-instrument-control-0.9.2.orig/doc/instrument-control.texi ++++ octave-instrument-control-0.9.2/doc/instrument-control.texi +@@ -63,6 +63,11 @@ To download a copy of the @acronym{GNU} + @end titlepage + @c %*** End of TITLEPAGE + ++@dircategory Math ++@direntry ++* Octave Intrument Control: (instrument-control). Instrument Control Toolkit for Octave ++@end direntry ++ + @c %*** Start of BODY + @contents + @ifnottex diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d06935a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +xtest-in-unit-tests.patch +xtest-resolvehost.patch +add-info-dir.patch diff --git a/debian/patches/xtest-in-unit-tests.patch b/debian/patches/xtest-in-unit-tests.patch new file mode 100644 index 0000000..f4993ab --- /dev/null +++ b/debian/patches/xtest-in-unit-tests.patch @@ -0,0 +1,129 @@ +Description: Allow some problematic unit tests to fail +Author: Rafael Laboissiere <rafael@debian.org> +Forwarded: not-needed +Last-Update: 2023-06-03 + +--- octave-instrument-control-0.3.1.orig/inst/instrhwinfo.m ++++ octave-instrument-control-0.3.1/inst/instrhwinfo.m +@@ -156,7 +156,7 @@ endfunction + %! # could fail if no i2c ports or not configured + %! assert(!isempty(instrhwinfo("i2c"))) + +-%!test ++%!xtest + %! p = pkg('describe', 'instrument-control'); + %! hw = instrhwinfo (); + %! assert (hw.ToolboxVersion, p{1}.version) +--- octave-instrument-control-0.3.1.orig/src/tcp/tcp.cc ++++ octave-instrument-control-0.3.1/src/tcp/tcp.cc +@@ -203,7 +203,7 @@ The tcp() shall return instance of @var{ + } + + #if 0 +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcp (addr, 80); + %! assert (! isnull (a)); +@@ -210,7 +210,7 @@ number of bytes currently available to r + %! assert (isa (a, 'octave_tcp')); + %! tcp_close (a); + +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcp (addr, 80, 'name', 'test', 'timeout', 2.5); + %! assert (! isnull (a)); +--- octave-instrument-control-0.3.1.orig/src/tcp/tcp_close.cc ++++ octave-instrument-control-0.3.1/src/tcp/tcp_close.cc +@@ -60,7 +60,7 @@ Close the interface and release a file d + #endif + } + #if 0 +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcp (addr, 80); + %! tcp_close (a); +--- octave-instrument-control-0.3.1.orig/src/tcp/tcp_read.cc ++++ octave-instrument-control-0.3.1/src/tcp/tcp_read.cc +@@ -114,7 +114,7 @@ The tcp_read() shall return number of by + } + + #if 0 +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcp (addr, 80); + %! assert (! isnull (a)); +--- octave-instrument-control-0.3.1.orig/src/tcp/tcp_write.cc ++++ octave-instrument-control-0.3.1/src/tcp/tcp_write.cc +@@ -93,7 +93,7 @@ Upon successful completion, tcp_write() + + %!error <Invalid call to tcp_write> tcp_write() + +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcp (addr, 80); + %! # call HTTP HEAD +--- octave-instrument-control-0.4.0.orig/inst/tcpip.m ++++ octave-instrument-control-0.4.0/inst/tcpip.m +@@ -72,7 +72,7 @@ function out = tcpip (varargin) + + endfunction + +-%!test ++%!xtest + %! a = tcpip ("octave.org", 80); + %! assert(isa(a, "octave_tcp")); + %! fclose(a); +--- octave-instrument-control-0.4.0.orig/src/tcp/__tcp_properties__.cc ++++ octave-instrument-control-0.4.0/src/tcp/__tcp_properties__.cc +@@ -97,7 +97,7 @@ Undocumented internal function.\n\ + %!shared ip + %! ip = resolvehost("www.octave.org", "address"); + +-%!test ++%!xtest + %! # test get + %! a = tcp (ip, 80); + %! assert (__tcp_properties__ (a,"type"), "tcp"); +@@ -110,7 +110,7 @@ Undocumented internal function.\n\ + %! tcp_close (a); + %! assert (__tcp_properties__ (a,"status"), "closed"); + +-%!test ++%!xtest + %! # test set + %! a = tcp(ip, 80); + %! __tcp_properties__ (a, 'name', "mytest"); +@@ -118,7 +118,7 @@ Undocumented internal function.\n\ + %! fail ("__tcp_properties__ (a,'invalid', 1)", "invalid property name"); + %! tcp_close (a); + +-%!test ++%!xtest + %! # test flush + %! a = tcp(ip, 80); + %! __tcp_properties__ (a, 'flush', 0); +@@ -132,7 +132,7 @@ Undocumented internal function.\n\ + + %!error <wrong number of arguments> __tcp_properties__ (1) + +-%!test ++%!xtest + %! a = tcp (ip, 80); + %! fail ("__tcp_properties__ (a, 'name', 'test', 0)", "wrong number of arguments"); + %! tcp_close (a); +--- octave-instrument-control-0.5.0.orig/src/tcp/tcp_timeout.cc ++++ octave-instrument-control-0.5.0/src/tcp/tcp_timeout.cc +@@ -82,7 +82,7 @@ If @var{timeout} parameter is omitted, t + } + + #if 0 +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcp (addr, 80); + %! assert(tcp_timeout(a), -1); diff --git a/debian/patches/xtest-resolvehost.patch b/debian/patches/xtest-resolvehost.patch new file mode 100644 index 0000000..e9d2160 --- /dev/null +++ b/debian/patches/xtest-resolvehost.patch @@ -0,0 +1,108 @@ +Description: Do not fail when calling resolvehost in standalone system + This is necessary when there is no network access at package build + time. +Author: Rafael Laboissière <rafael@debian.org> +Forwarded: not-needed +Last-Update: 2023-06-03 + +--- octave-instrument-control-0.7.0.orig/src/tcp/__tcp_properties__.cc ++++ octave-instrument-control-0.7.0/src/tcp/__tcp_properties__.cc +@@ -95,7 +95,11 @@ Undocumented internal function.\n\ + } + #if 0 + %!shared ip +-%! ip = resolvehost("www.octave.org", "address"); ++%! try ++%! ip = resolvehost("www.octave.org", "address"); ++%! catch ++%! warning ("Network access is neede for running the unit tests."); ++%! end_try_catch + + %!xtest + %! # test get +--- octave-instrument-control-0.7.0.orig/src/tcpclient/__tcpclient_properties__.cc ++++ octave-instrument-control-0.7.0/src/tcpclient/__tcpclient_properties__.cc +@@ -158,9 +158,13 @@ Undocumented internal function.\n\ + } + #if 0 + %!shared ip +-%! ip = resolvehost("www.octave.org", "address"); ++%! try ++%! ip = resolvehost("www.octave.org", "address"); ++%! catch ++%! warning ("Network access is neede for running the unit tests."); ++%! end_try_catch + +-%!test ++%!xtest + %! # test get + %! a = tcpclient (ip, 80); + %! assert (__tcpclient_properties__ (a,"type"), "tcpclient"); +@@ -172,7 +172,7 @@ Undocumented internal function.\n\ + %! fail ("__tcpclient_properties__ (a,'invalid')", "invalid property name"); + %! clear a + +-%!test ++%!xtest + %! # test set + %! a = tcpclient(ip, 80); + %! __tcpclient_properties__ (a, 'name', "mytest"); +@@ -180,7 +184,7 @@ Undocumented internal function.\n\ + %! fail ("__tcpclient_properties__ (a,'invalid', 1)", "invalid property name"); + %! clear a + +-%!test ++%!xtest + %! # test flush + %! a = tcpclient(ip, 80); + %! __tcpclient_properties__ (a, 'flush', 0); +@@ -194,7 +198,7 @@ Undocumented internal function.\n\ + + %!error <wrong number of arguments> __tcpclient_properties__ (1) + +-%!test ++%!xtest + %! a = tcpclient (ip, 80); + %! fail ("__tcpclient_properties__ (a, 'name', 'test', 0)", "wrong number of arguments"); + %! clear a +--- octave-instrument-control-0.7.0.orig/src/tcpclient/__tcpclient_read__.cc ++++ octave-instrument-control-0.7.0/src/tcpclient/__tcpclient_read__.cc +@@ -112,7 +112,7 @@ Private function t read from tcpclient i + } + + #if 0 +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcpclient (addr, 80); + %! assert (! isnull (a)); +--- octave-instrument-control-0.7.0.orig/src/tcpclient/__tcpclient_write__.cc ++++ octave-instrument-control-0.7.0/src/tcpclient/__tcpclient_write__.cc +@@ -91,7 +91,7 @@ Upon successful completion, __tcpclient_ + + %!error <Invalid call to __tcpclient_write__> __tcpclient_write__() + +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcpclient (addr, 80);; + %! # call HTTP HEAD +--- octave-instrument-control-0.7.0.orig/src/tcpclient/tcpclient.cc ++++ octave-instrument-control-0.7.0/src/tcpclient/tcpclient.cc +@@ -193,14 +193,14 @@ User data\n \ + } + + #if 0 +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcpclient (addr, 80); + %! assert (! isnull (a)); + %! assert (isa (a, 'octave_tcpclient')); + %! clear a + +-%!test ++%!xtest + %! addr = resolvehost ('gnu.org', 'address'); + %! a = tcpclient (addr, 80, 'name', 'test', 'timeout', 2.5); + %! assert (! isnull (a)); diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..4c1ce08 --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +%: + dh $@ --buildsystem=octave + +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) +override_dh_auto_build: + make -k docs || true +endif diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..a52d8bc --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,13 @@ +# The new official web site for the Octave-Forge packages is now +# hosted at gnu-octave.github.io, even though the tarballs are +# still distributed at SourceForge. In debian/watch, it is necessary +# to explicitly indicate the links at downloads.sourceforge.net. This +# is triggering a Lintian warning, but it is a false positive. +octave-instrument-control source: debian-watch-lacks-sourceforge-redirector https://gnu-octave.github.io/packages/instrument-control/ https://downloads.sourceforge.net/project/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases/instrument-control-(.+).tar.gz [debian/watch:3] + +# The doc/instrument-control.html file, which is shipped in the +# upstream tarball, is also built from file doc/octave-cfitsio.texi, +# so the source is indeed present. Lintian is known to be +# oversensitive in the source-is-missing check for HTML files (see +# Bug#1019980). +octave-instrument-control source: source-is-missing [doc/instrument-control.html] diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..0b6a590 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,7 @@ +Archive: SourceForge +Bug-Database: https://octave.space/savannah/?Action=get&Format=HTMLCSS&Title=%5Boctave%20forge%5D%20%28instrument-control%29 +Bug-Submit: https://savannah.gnu.org/bugs/?func=additem&group=octave +Repository: http://hg.code.sf.net/p/octave/instrument-control +Repository-Browse: https://octave.sourceforge.io/pkg-repository/instrument-control/ +Changelog: https://sourceforge.net/p/octave/instrument-control/ci/default/tree/NEWS +Documentation: https://octave.sourceforge.io/instrument-control/package_doc/ diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..aa67190 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +https://gnu-octave.github.io/packages/instrument-control/ \ + https://downloads.sourceforge.net/project/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases/instrument-control-(.+).tar.gz |