[nauty] 03/03: Imported Debian patch 2.6r5+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Apr 23 01:51:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository nauty.
commit c5fc0f353295ca1c4f4f0f4e70db7b83cb172109
Author: Jerome BENOIT <calculus at rezozer.net>
Date: Sat Apr 23 02:37:51 2016 +0100
Imported Debian patch 2.6r5+ds-1
---
debian/changelog | 12 +++++++
debian/libnauty2.symbols | 8 +++++
debian/patches/upstream-autotoolization.patch | 13 +++----
debian/patches/upstream-fix-gt_numorbits.patch | 2 +-
debian/patches/upstream-zlib-blisstog_c.patch | 2 +-
debian/tests/control | 4 +++
debian/tests/make-check | 47 ++++++++++++++++++++++++++
7 files changed, 80 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 33ee894..e6cc71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nauty (2.6r5+ds-1) unstable; urgency=medium
+
+ * New upstream version.
+ * Debianization:
+ - debian/patches/*:
+ - d/p/upstream-autotoolization.patch, update;
+ - debian/libnauty2.symbols, update;
+ - debian/tests/*:
+ - d/t/make-check, introduce.
+
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 23 Apr 2016 01:36:48 +0000
+
nauty (2.6r3+ds-2) unstable; urgency=medium
* FTBFS bug fix release (Closes: #819430):
diff --git a/debian/libnauty2.symbols b/debian/libnauty2.symbols
index d243485..1876ffe 100644
--- a/debian/libnauty2.symbols
+++ b/debian/libnauty2.symbols
@@ -42,6 +42,7 @@ libnauty.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTY_2.5 2.5r6
copy_sg at LIBNAUTY_2.5 2.5r6
copycomment at LIBNAUTY_2.5 2.5r6
+ countcells at LIBNAUTY_2.5 2.6r5
cyclecount1 at LIBNAUTY_2.5 2.5r6
cyclecount at LIBNAUTY_2.5 2.5r6
degstats2 at LIBNAUTY_2.5 2.6r2
@@ -304,6 +305,7 @@ libnautyA1.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYA1_2.5 2.5r6
copy_sg at LIBNAUTYA1_2.5 2.5r6
copycomment at LIBNAUTYA1_2.5 2.5r6
+ countcells at LIBNAUTYA1_2.5 2.6r5
cyclecount1 at LIBNAUTYA1_2.5 2.5r6
cyclecount at LIBNAUTYA1_2.5 2.5r6
degstats2 at LIBNAUTYA1_2.5 2.6r2
@@ -566,6 +568,7 @@ libnautyL0.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYL0_2.5 2.5r6
copy_sg at LIBNAUTYL0_2.5 2.5r6
copycomment at LIBNAUTYL0_2.5 2.5r6
+ countcells at LIBNAUTYL0_2.5 2.6r5
cyclecount1 at LIBNAUTYL0_2.5 2.5r6
cyclecount at LIBNAUTYL0_2.5 2.5r6
degstats2 at LIBNAUTYL0_2.5 2.6r2
@@ -828,6 +831,7 @@ libnautyL1.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYL1_2.5 2.5r6
copy_sg at LIBNAUTYL1_2.5 2.5r6
copycomment at LIBNAUTYL1_2.5 2.5r6
+ countcells at LIBNAUTYL1_2.5 2.6r5
cyclecount1 at LIBNAUTYL1_2.5 2.5r6
cyclecount at LIBNAUTYL1_2.5 2.5r6
degstats2 at LIBNAUTYL1_2.5 2.6r2
@@ -1090,6 +1094,7 @@ libnautyS0.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYS0_2.5 2.5r6
copy_sg at LIBNAUTYS0_2.5 2.5r6
copycomment at LIBNAUTYS0_2.5 2.5r6
+ countcells at LIBNAUTYS0_2.5 2.6r5
cyclecount1 at LIBNAUTYS0_2.5 2.5r6
cyclecount at LIBNAUTYS0_2.5 2.5r6
degstats2 at LIBNAUTYS0_2.5 2.6r2
@@ -1352,6 +1357,7 @@ libnautyS1.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYS1_2.5 2.5r6
copy_sg at LIBNAUTYS1_2.5 2.5r6
copycomment at LIBNAUTYS1_2.5 2.5r6
+ countcells at LIBNAUTYS1_2.5 2.6r5
cyclecount1 at LIBNAUTYS1_2.5 2.5r6
cyclecount at LIBNAUTYS1_2.5 2.5r6
degstats2 at LIBNAUTYS1_2.5 2.6r2
@@ -1614,6 +1620,7 @@ libnautyW0.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYW0_2.5 2.5r6
copy_sg at LIBNAUTYW0_2.5 2.5r6
copycomment at LIBNAUTYW0_2.5 2.5r6
+ countcells at LIBNAUTYW0_2.5 2.6r5
cyclecount1 at LIBNAUTYW0_2.5 2.5r6
cyclecount at LIBNAUTYW0_2.5 2.5r6
degstats2 at LIBNAUTYW0_2.5 2.6r2
@@ -1876,6 +1883,7 @@ libnautyW1.so.2 libnauty2 #MINVER#
converse_sg at LIBNAUTYW1_2.5 2.5r6
copy_sg at LIBNAUTYW1_2.5 2.5r6
copycomment at LIBNAUTYW1_2.5 2.5r6
+ countcells at LIBNAUTYW1_2.5 2.6r5
cyclecount1 at LIBNAUTYW1_2.5 2.5r6
cyclecount at LIBNAUTYW1_2.5 2.5r6
degstats2 at LIBNAUTYW1_2.5 2.6r2
diff --git a/debian/patches/upstream-autotoolization.patch b/debian/patches/upstream-autotoolization.patch
index 5bd5476..ccac1e0 100644
--- a/debian/patches/upstream-autotoolization.patch
+++ b/debian/patches/upstream-autotoolization.patch
@@ -2,14 +2,14 @@ Description: upstream autotoolization
Attempt to autotoolize nauty source.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-03-19
+Last-Update: 2016-04-22
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,22 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nauty-h.in)
-+AC_INIT([nauty],[2.6.3],[bdm at cs.anu.edu.au],[nauty],[http://pallini.di.uniroma1.it/])
++AC_INIT([nauty],[2.6.5],[bdm at cs.anu.edu.au],[nauty],[http://pallini.di.uniroma1.it/])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([autotool])
+AC_CONFIG_SRCDIR([dreadnaut.c])
@@ -801,7 +801,7 @@ Last-Update: 2016-03-19
rm $out1 $out2
--- /dev/null
+++ b/nauty.map
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,279 @@
+LIBNAUTY_2.5 {
+global:
+## nauty.h
@@ -895,6 +895,7 @@ Last-Update: 2016-03-19
+converse_sg;
+copycomment;
+complement_sg;
++countcells;
+flushline;
+fixit;
+getint;
@@ -1345,7 +1346,7 @@ Last-Update: 2016-03-19
+#endif /* _NAUTINV_H_ */
--- a/naututil-h.in
+++ b/naututil-h.in
-@@ -114,9 +114,13 @@
+@@ -115,9 +115,13 @@
* *
*****************************************************************************/
@@ -1362,7 +1363,7 @@ Last-Update: 2016-03-19
/* At this point we can assume that <sys/types.h>, <unistd.h>, <stddef.h>,
<stdlib.h>, <string.h> or <strings.h> and <malloc.h> if necessary have
been included if they exist. */
-@@ -285,3 +289,5 @@
+@@ -287,3 +291,5 @@
#endif /*NAUTY_SEED_DEFINED*/
/* @edit_msg@ */
@@ -1488,7 +1489,7 @@ Last-Update: 2016-03-19
#ifdef __cplusplus
extern "C" {
#endif
-@@ -42,3 +45,5 @@
+@@ -44,3 +47,5 @@
#ifdef __cplusplus
}
#endif
diff --git a/debian/patches/upstream-fix-gt_numorbits.patch b/debian/patches/upstream-fix-gt_numorbits.patch
index c374523..b708e36 100644
--- a/debian/patches/upstream-fix-gt_numorbits.patch
+++ b/debian/patches/upstream-fix-gt_numorbits.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-11-22
--- a/gtools-h.in
+++ b/gtools-h.in
-@@ -267,6 +267,7 @@
+@@ -273,6 +273,7 @@
extern TLS_ATTR char *readg_line;
extern TLS_ATTR size_t ogf_linelen;
extern TLS_ATTR boolean is_pipe;
diff --git a/debian/patches/upstream-zlib-blisstog_c.patch b/debian/patches/upstream-zlib-blisstog_c.patch
index c0d288a..e4f1733 100644
--- a/debian/patches/upstream-zlib-blisstog_c.patch
+++ b/debian/patches/upstream-zlib-blisstog_c.patch
@@ -148,7 +148,7 @@ Last-Update: 2016-03-18
int nmin,nmax;
- char zcmd[515];
- HELP;
+ HELP; PUTVERSION;
nmax = -1;
if (argc >= 2 && argv[1][0] == '-' && argv[1][1] == 'n')
diff --git a/debian/tests/control b/debian/tests/control
index d8c68dd..8b6ca4c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,6 @@
+Tests: make-check
+Restrictions: needs-recommends
+Depends: nauty, tcc
+
Tests: build-examples
Depends: nauty-doc, libnauty2-dev, build-essential, pkg-config
diff --git a/debian/tests/make-check b/debian/tests/make-check
new file mode 100755
index 0000000..c41c261
--- /dev/null
+++ b/debian/tests/make-check
@@ -0,0 +1,47 @@
+#!/bin/bash
+# autopkgtest check based on upstream check script runalltests
+set -ue
+
+tcc naucompare.c -o $ADTTMP/naucompare
+
+cp -p nautest[abcdefg].ans $ADTTMP
+
+cd $ADTTMP
+
+tdx=0
+
+runonetest() {
+ local cmd="$1"
+ local ok="$2"
+
+ printf "%-83s %s " "$cmd" "$ok"
+
+ if [ ! -r "$ok" ] ; then
+ echo "File $ok not found or not readable."
+ exit 1
+ fi
+
+ tdx=$(( $tdx + 1 ))
+ out1=$(printf "runtest-%02d.data" $tdx)
+ out2=$(printf "runtest-%02d.atad" $tdx)
+
+ eval $cmd 2>$out2 >$out1
+
+ LC_COLLATE=C sort $out2 >>$out1
+ if ./naucompare "$out1" "$ok" ; then
+ rm $out1 $out2
+ else
+ echo "Output file is $out1" 1>&2
+ rm $out2
+ fi
+ }
+
+runonetest "nauty-geng -ud1D7t 11" nautesta.ans
+runonetest "nauty-geng -cd1f 10 | nauty-labelg -q" nautestb.ans
+runonetest "nauty-genrang -r3 114 100 | nauty-countg --nedDr -q" nautestc.ans
+runonetest "nauty-gentourng -q -z 8 | nauty-pickg -T3" nautestd.ans
+runonetest "nauty-gentreeg -q -s 18 | nauty-countg -z6 --o" nauteste.ans
+runonetest "nauty-geng -c -q 8 8 | nauty-directg -q -o | nauty-converseg -q | nauty-labelg -q" nautestf.ans
+runonetest "nauty-genbg -q 4 3 10 | nauty-vcolg -m6 -T" nautestg.ans
+
+exit 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nauty.git
More information about the debian-science-commits
mailing list