[gap-grape] 01/01: Imported Debian patch 4r7+ds-3
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Apr 29 23:43:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository gap-grape.
commit 27cff1923dce07e1686af1d160d0cab65cceb960
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Apr 29 23:34:44 2016 +0000
Imported Debian patch 4r7+ds-3
---
debian/changelog | 13 +++++++
debian/control | 4 +-
debian/gap-grape.README.Debian | 11 ++++++
debian/gap-grape.install | 1 +
debian/patches/debianization.patch | 43 ++++++++++++++--------
debian/patches/series | 1 +
.../patches/upstream-source-nauty_and_bliss.patch | 43 ++++++++++++++++++++++
debian/tests/control | 2 +-
debian/tests/makecheck.tst | 11 ++++++
9 files changed, 110 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cc05d4b..7f2d429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gap-grape (4r7+ds-3) unstable; urgency=medium
+
+ * Debianization:
+ - debian/control:
+ - Depends field, bump to GAP 4r8;
+ - Standards Version, bump to 3.9.8 (no change);
+ - debian/gap-grape.install, tst folder is now installed;
+ - debian/tests/, harden;
+ - debian/patches/:
+ d/p/upstream-source-nauty_and_bliss.patch, introduce.
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 29 Apr 2016 23:32:56 +0000
+
gap-grape (4r7+ds-2) unstable; urgency=medium
* Debianization:
diff --git a/debian/control b/debian/control
index 81c8613..9cc9d2e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
- gap, gap-doc,
+ gap (>=4r8p3), gap-gapdoc (>=1.5.1-2),
nauty, bliss,
texlive-generic-recommended, texlive-fonts-recommended, tth
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: http://www.gap-system.org/Packages/grape.html
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gap-grape.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gap-grape.git
diff --git a/debian/gap-grape.README.Debian b/debian/gap-grape.README.Debian
new file mode 100644
index 0000000..61560a3
--- /dev/null
+++ b/debian/gap-grape.README.Debian
@@ -0,0 +1,11 @@
+GAP GRAPE for Debian GNU/Linux
+==============================
+
+External programs dreadnaut (nauty) and bliss (bliss)
+-----------------------------------------------------
+By default, the external programs dreadnaut and bliss are searched within the
+executable folders as listed in the environment variable PATH, as expected on
+GNU/Linux systems. (This scheme has been suggested to the upstream maintainer.)
+
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 29 Apr 2016 23:27:52 +0000
diff --git a/debian/gap-grape.install b/debian/gap-grape.install
index b8ee08e..520592f 100644
--- a/debian/gap-grape.install
+++ b/debian/gap-grape.install
@@ -1,5 +1,6 @@
PackageInfo.g init.g usr/share/gap/pkg/grape
grh usr/share/gap/pkg/grape
lib usr/share/gap/pkg/grape
+tst usr/share/gap/pkg/grape
htm usr/share/gap/pkg/grape
doc/manual.lab doc/manual.six doc/manual.pdf usr/share/gap/pkg/grape/doc
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 0ca70d8..ca9e662 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,7 +2,7 @@ Description: debianization
Meant to maintain a minimal debian/rules, to fix annoying
warnings, to address Debian specific stuff in general.
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-03-22
+Last-Update: 2016-04-29
--- a/doc/manual.tex
+++ b/doc/manual.tex
@@ -56,19 +56,30 @@ Last-Update: 2016-03-22
#############################################################################
##
---- a/lib/grape.g
-+++ b/lib/grape.g
-@@ -41,11 +41,10 @@
+--- a/PackageInfo.g
++++ b/PackageInfo.g
+@@ -223,15 +223,15 @@
+ ## (When this is used for package loading in the future the availability
+ ## tests of other packages, as given above, will be done automatically and
+ ## need not be included here.)
+-AvailabilityTest := ReturnTrue,
+-# AvailabilityTest :=
+-# function()
+-# if ExternalFilename(DirectoriesSystemPrograms(),"dreadnaut") = fail
+-# then
+-# LogPackageLoadingMessage(PACKAGE_WARNING,["nauty/dreadnaut binary not installed,", "functions depending on nauty will not work"]);
+-# fi;
+-# return true;
+-# end,
++# AvailabilityTest := ReturnTrue,
++AvailabilityTest :=
++function()
++ if ExternalFilename(DirectoriesSystemPrograms(),"dreadnaut") = fail
++ then
++ LogPackageLoadingMessage(PACKAGE_WARNING,["nauty/dreadnaut binary not installed,", "functions depending on nauty will not work"]);
++ fi;
++ return true;
++end,
- GRAPE_NAUTY := true; # Use nauty when true, else use bliss.
-
--GRAPE_DREADNAUT_EXE :=
-- ExternalFilename(DirectoriesPackagePrograms("grape"),"dreadnautB");
-+GRAPE_DREADNAUT_EXE := "/usr/bin/dreadnaut";
- # filename of dreadnaut or dreadnautB executable
-
--GRAPE_BLISS_EXE := "/home/leonard/bliss-0.73/bliss";
-+GRAPE_BLISS_EXE := "/usr/bin/bliss";
- # filename of bliss executable
-
- BindGlobal("GRAPE_OrbitRepresentatives",function(arg)
+ ## Suggest here if the package should be *automatically loaded* when GAP is
+ ## started. This should usually be 'false'. Say 'true' only if your package
diff --git a/debian/patches/series b/debian/patches/series
index 036d6f8..d1f1d7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-source-nauty_and_bliss.patch
upstream-repack-adjustment.patch
upstream-fix-doc-faulty-references.patch
debianization.patch
diff --git a/debian/patches/upstream-source-nauty_and_bliss.patch b/debian/patches/upstream-source-nauty_and_bliss.patch
new file mode 100644
index 0000000..9a0309e
--- /dev/null
+++ b/debian/patches/upstream-source-nauty_and_bliss.patch
@@ -0,0 +1,43 @@
+Description: upstream: harden: source: nauty and bliss
+ As default set the path to the external programs dreadnaut
+ (and bliss) with respect to the system executable path list
+ (as expect on Un*x environment); meant to be submitted to
+ the upstream maintainer.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-04-29
+
+--- a/lib/grape.g
++++ b/lib/grape.g
+@@ -41,11 +41,12 @@
+
+ GRAPE_NAUTY := true; # Use nauty when true, else use bliss.
+
+-GRAPE_DREADNAUT_EXE :=
+- ExternalFilename(DirectoriesPackagePrograms("grape"),"dreadnautB");
++GRAPE_DREADNAUT_EXE :=
++ ExternalFilename(DirectoriesSystemPrograms(),"dreadnaut");
+ # filename of dreadnaut or dreadnautB executable
+
+-GRAPE_BLISS_EXE := "/home/leonard/bliss-0.73/bliss";
++GRAPE_BLISS_EXE :=
++ ExternalFilename(DirectoriesSystemPrograms(),"bliss");
+ # filename of bliss executable
+
+ BindGlobal("GRAPE_OrbitRepresentatives",function(arg)
+--- a/PackageInfo.g
++++ b/PackageInfo.g
+@@ -224,10 +224,10 @@
+ ## tests of other packages, as given above, will be done automatically and
+ ## need not be included here.)
+ AvailabilityTest := ReturnTrue,
+-# AvailabilityTest :=
++# AvailabilityTest :=
+ # function()
+-# if ExternalFilename(DirectoriesPackagePrograms("grape"),"dreadnautB") = fail
+-# and ExternalFilename(DirectoriesPackagePrograms("grape"),"dreadnautB.exe") = fail then
++# if ExternalFilename(DirectoriesSystemPrograms(),"dreadnaut") = fail
++# then
+ # LogPackageLoadingMessage(PACKAGE_WARNING,["nauty/dreadnaut binary not installed,", "functions depending on nauty will not work"]);
+ # fi;
+ # return true;
diff --git a/debian/tests/control b/debian/tests/control
index b111f18..0b322d9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1 +1 @@
-Test-command: echo "Test(\"tst/testall.tst\"); quit;" | gap -A -q -T
+Test-command: echo "QUIT_GAP(TestDirectory(\"debian/tests\"));" | gap -A -q -T
diff --git a/debian/tests/makecheck.tst b/debian/tests/makecheck.tst
new file mode 100644
index 0000000..2d9864f
--- /dev/null
+++ b/debian/tests/makecheck.tst
@@ -0,0 +1,11 @@
+## debian/tests/makecheck.tst -- GAP Test script
+## script format: GAP Reference Manual section 7.9 Test Files (GAP 4r8)
+##
+gap> TestPackageAvailability( "grape" , "=4.7" , true );
+"/usr/share/gap/pkg/grape"
+gap> TestPackage( "grape" );
+#I No errors detected while testing package grape version 4.7
+#I using the test file `/usr/share/gap/pkg/grape/tst/testall.tst'
+
+##
+## eos
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-grape.git
More information about the debian-science-commits
mailing list