Merge branch 't/20901/upgrade_bliss_package_to_0_73_with_debian_patches__install_header_files_in_location_expected_by_polymake' into t/20892/20892

Author: Matthias Koeppe

build/pkgs/bliss/SPKG.txt

@@ -1,4 +1,4 @@
-= bliss 0.72 =
+= bliss 0.73+debian-1 =
 
 == Description ==
 
@@ -15,13 +15,12 @@ Bliss is currently being maintained by Tommi Junttila and Petteri Kaski.
 
 http://www.tcs.tkk.fi/Software/bliss/index.html
 
+We apply patches generated from https://github.com/mkoeppe/bliss
+(branch apply_debian_patches) as our upstream.  This tracks the
+patches from the Debian package, adding an autotools build system
+and adjusting the include file locations.
+
 == Dependencies ==
 
 None
 
-== Patches ==
-
-There is one patch to be applied that affects the code for computing
-automorphism groups of Digraphs. See http://trac.sagemath.org/ticket/17464#comment:33
-
-The patch will be removed once the author of bliss makes a new release.

build/pkgs/bliss/checksums.ini

@@ -1,4 +1,4 @@
-tarball=bliss-VERSION.zip
-sha1=ca86a10c674a5b3ec9fa163edf6ffde002699628
-md5=72f2e310786923b5c398ba0fc40b42ce
-cksum=1722393284
+tarball=bliss-VERSION.tar.gz
+sha1=1da8f098046824fbfff4c64c337e28b2a082f74f
+md5=452aea8737d3c4ad0d8ff39180be8004
+cksum=2193930007

build/pkgs/bliss/package-version.txt

@@ -1 +1 @@
-0.73
+0.73+debian-1+sage-2016-08-02

build/pkgs/bliss/spkg-install

@@ -17,8 +17,7 @@ for patch in ../patches/*.patch; do
     fi
 done
 
-
-$MAKE && cp libbliss.a "$SAGE_LOCAL/lib" && cp *.hh "$SAGE_LOCAL/include"
+./configure --prefix="$SAGE_LOCAL" --disable-gmp && $MAKE && $MAKE install
 
 if [ $? -ne 0 ]; then
     echo "An error occurred whilst building bliss"

build/pkgs/bliss/spkg-src

@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# creates the tarball in the current dir, to be moved to ../../../upstream
+#
+# adapted from cliquer/spkg-src
+
+die () {
+    echo >&2 "$@"
+    exit 1
+}
+
+rm -rf bliss/
+git clone -b sage_package https://github.com/mkoeppe/bliss.git  || die "Failed to git clone"
+cd bliss/ 
+
+VERSION=`autoconf --trace='AC_INIT:$2'`
+libtoolize || die "Failed to autoreconf"
+autoreconf -fi || die "Failed to autoreconf"
+automake --add-missing --copy || die "automake failed"
+./configure || die "configure failed"
+
+rm -f bliss-$VERSION.tar.gz
+make dist || die "make dist failed"
+mv bliss-$VERSION.tar.gz ../
+cd ..
+rm -rf bliss/ 
+
+

src/sage/graphs/bliss.pyx

@@ -32,7 +32,7 @@ from cpython cimport PyObject
 from libc.limits cimport LONG_MAX
 
 
-cdef extern from "graph.hh" namespace "bliss":
+cdef extern from "bliss/graph.hh" namespace "bliss":
 
     cdef cppclass Stats:
         pass