[Pkg-octave-commit] [octave-pkg-dev] 01/01: Put the check-pkg script into a separate binary package

[Rafael Laboissiere]

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

rafael pushed a commit to branch master
in repository octave-pkg-dev.

commit f0eb134e0ca73482871bb2070ed7a4146e3bc48b
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Sep 3 19:07:25 2017 -0300

    Put the check-pkg script into a separate binary package
    
    This will allow running the automated unit tests in autopkgtest
    without having to install the whole building environment for Octave.
    
    Gbp-Dch: Full
---
 .gitignore                        | 13 +++++++------
 check-pkg                         |  5 +++++
 debian/control                    | 11 +++++++++++
 debian/octave-autopkgtest.install |  1 +
 debian/octave-pkg-dev.install     |  1 -
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 294d170..94a2aab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-debian/files
-debian/octave-pkg-dev.debhelper.log
-debian/octave-pkg-dev/
-debian/octave-pkg-dev.substvars
-make-octave-forge-debpkg
-make-octave-forge-debpkg.1
+/debian/files
+/debian/octave-pkg-dev.debhelper.log
+/debian/octave-pkg-dev/
+/debian/octave-autopkgtest/
+/debian/*.substvars
+/make-octave-forge-debpkg
+/make-octave-forge-debpkg.1
 /debian/.debhelper/
diff --git a/check-pkg b/check-pkg
index bb93245..cf6093d 100755
--- a/check-pkg
+++ b/check-pkg
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+# Set the octave executable and the octave options, when the
+# corresponding variables are absent from the environment.
+[ -z "$octave" ] && octave=octave
+[ -z "$octave_options" ] && octave_options="--no-history --silent --no-init-file --no-window-system"
+
 [ -e PKG_ADD ] && mv PKG_ADD PKG_ADD.bak
 
 echo Checking package...
diff --git a/debian/control b/debian/control
index fe59cda..f990984 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-octave/octave-pkg-dev.git
 Package: octave-pkg-dev
 Architecture: all
 Depends: liboctave-dev (>= 4.0.0~rc3),
+         octave-autopkgtest,
          debhelper (>= 10),
          cdbs,
          libmime-tools-perl,
@@ -32,3 +33,13 @@ Description: infrastructure to build Octave packages
  .
  This package is intended to be used by the Debian Octave Group
  and should be of little interest to general users.
+
+Package: octave-autopkgtest
+Architecture: all
+Conflicts: octave-pkg-dev (<= 1.5.0)
+Description: script for automatic test of Octave add-on packages
+ This package contains the check-pkg script (originally in the
+ octave-pkg-dev package) that runs the unit tests contained in all .m and
+ .cc files available in the source tree from which it is launched.  It is
+ intended to be used by the support for Octave-Forge add-on packages
+ implemented in autodep8.
diff --git a/debian/octave-autopkgtest.install b/debian/octave-autopkgtest.install
new file mode 100644
index 0000000..f6e410d
--- /dev/null
+++ b/debian/octave-autopkgtest.install
@@ -0,0 +1 @@
+check-pkg			usr/share/octave-pkg-dev
diff --git a/debian/octave-pkg-dev.install b/debian/octave-pkg-dev.install
index 0b9b03a..8c0aa14 100644
--- a/debian/octave-pkg-dev.install
+++ b/debian/octave-pkg-dev.install
@@ -3,5 +3,4 @@ octave-pkg-helper	        usr/share/octave/debian/dh
 make-octave-forge-debpkg        usr/bin
 check-version			usr/share/octave-pkg-dev
 install-pkg			usr/share/octave-pkg-dev
-check-pkg			usr/share/octave-pkg-dev
 install-docs			usr/share/octave-pkg-dev

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-pkg-dev.git