[blitz++] 16/18: update to 0.10
Jerome Benoit
calculus-guest at moszumanska.debian.org
Tue Aug 2 00:55:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to annotated tag debian/0.10-1
in repository blitz++.
commit 7217fd93c800f3c6cd22b65f6f1cbd09c92bf8f1
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Date: Fri Jul 6 12:39:15 2012 +0000
update to 0.10
---
changelog | 18 ++++++++
control | 2 +-
libblitz-doc.install | 2 +-
patches/01_gcc34_amd64.patch | 19 --------
patches/01_gcc_43_missing_includes.patch | 20 --------
patches/30_fix_doxygen_install_target.patch | 11 -----
patches/40_prevent_celetion_of_texi_files.patch | 61 -------------------------
patches/examples.patch | 13 ++++++
patches/series | 10 ++--
patches/testsuite.patch | 10 ++++
rules | 55 +++++++++++++++-------
11 files changed, 87 insertions(+), 134 deletions(-)
diff --git a/changelog b/changelog
index a1e5378..f96d145 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,21 @@
+blitz++ (1:0.10-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+
+ * debian/rules:
+ - update for new release
+ - add override_dh_auto_test target
+ - regenerate configure and Makefile.am
+ * debian/control:
+ - add libtool, automake to BuildDepends
+ * debian/libblitz-doc.install
+ - modify path for html files
+ * remove uneeded patches
+ * add examples.patch
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Fri, 06 Jul 2012 09:15:30 +0200
+
blitz++ (1:0.9-13) unstable; urgency=low
* debian/control:
diff --git a/control b/control
index a6424f9..7362f06 100644
--- a/control
+++ b/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: gfortran | fortran-compiler, autotools-dev, texinfo,
+Build-Depends: gfortran | fortran-compiler, autotools-dev, libtool, automake, texinfo,
libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev,
debhelper (>= 9), d-shlibs, doxygen-latex, texi2html, cfortran
Standards-Version: 3.9.3
diff --git a/libblitz-doc.install b/libblitz-doc.install
index 858e0da..354d38d 100644
--- a/libblitz-doc.install
+++ b/libblitz-doc.install
@@ -1,4 +1,4 @@
doc/doxygen/html/* usr/share/doc/libblitz-doc/html/doxygen
-doc/*.html usr/share/doc/libblitz-doc/html/
+doc/blitz.html/*.html usr/share/doc/libblitz-doc/html/
doc/*.gif usr/share/doc/libblitz-doc/html/
doc/*.jpg usr/share/doc/libblitz-doc/html/
diff --git a/patches/01_gcc34_amd64.patch b/patches/01_gcc34_amd64.patch
deleted file mode 100644
index ea93e9e..0000000
--- a/patches/01_gcc34_amd64.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- blitz++-0.9.orig/blitz/funcs.h
-+++ blitz++-0.9/blitz/funcs.h
-@@ -27,6 +27,7 @@
- #ifndef BZ_FUNCS_H
- #define BZ_FUNCS_H
-
-+#include <cstdlib>
- #include <blitz/blitz.h>
- #include <blitz/promote.h>
- #include <blitz/prettyprint.h>
---- blitz++-0.9.orig/blitz/mathfunc.h
-+++ blitz++-0.9/blitz/mathfunc.h
-@@ -1,5 +1,6 @@
- // Generated: genmathfunc.cpp Jan 28 2005 12:04:32
-
-+#include <cstdlib>
- #ifndef BZ_MATHFUNC_H
- #define BZ_MATHFUNC_H
-
diff --git a/patches/01_gcc_43_missing_includes.patch b/patches/01_gcc_43_missing_includes.patch
deleted file mode 100644
index 4e1146b..0000000
--- a/patches/01_gcc_43_missing_includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- blitz++-0.9.orig/blitz/funcs.h
-+++ blitz++-0.9/blitz/funcs.h
-@@ -30,6 +30,7 @@
- #include <blitz/blitz.h>
- #include <blitz/promote.h>
- #include <blitz/prettyprint.h>
-+#include <cstdlib>
-
- BZ_NAMESPACE(blitz)
-
---- blitz++-0.9.orig/blitz/prettyprint.h
-+++ blitz++-0.9/blitz/prettyprint.h
-@@ -27,6 +27,7 @@
-
- #ifndef BZ_PRETTYPRINT_H
- #define BZ_PRETTYPRINT_H
-+#include <cstdlib>
-
- BZ_NAMESPACE(blitz)
-
diff --git a/patches/30_fix_doxygen_install_target.patch b/patches/30_fix_doxygen_install_target.patch
deleted file mode 100644
index a173cf2..0000000
--- a/patches/30_fix_doxygen_install_target.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blitz++-0.9.orig/doc/doxygen/Makefile.in
-+++ blitz++-0.9/doc/doxygen/Makefile.in
-@@ -171,7 +171,7 @@
- FLIBS = @FLIBS@
- FORTRAN_ENABLED_FALSE = @FORTRAN_ENABLED_FALSE@
- FORTRAN_ENABLED_TRUE = @FORTRAN_ENABLED_TRUE@
--INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DATA = cp -a
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/patches/40_prevent_celetion_of_texi_files.patch b/patches/40_prevent_celetion_of_texi_files.patch
deleted file mode 100644
index edf0905..0000000
--- a/patches/40_prevent_celetion_of_texi_files.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- blitz++-0.9.orig.orig/doc/stencils/Makefile.am
-+++ blitz++-0.9.orig/doc/stencils/Makefile.am
-@@ -70,5 +70,5 @@
- $(MAKE) $(AM_MAKEFLAGS) stencils
-
- clean-local:
-- -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil *.texi
-+ -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil
-
---- blitz++-0.9.orig.orig/doc/stencils/Makefile.in
-+++ blitz++-0.9.orig/doc/stencils/Makefile.in
-@@ -480,7 +480,7 @@
- $(MAKE) $(AM_MAKEFLAGS) stencils
-
- clean-local:
-- -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil *.texi
-+ -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files dump-stencil
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- blitz++-0.9.orig.orig/doc/examples/Makefile.am
-+++ blitz++-0.9.orig/doc/examples/Makefile.am
-@@ -75,6 +75,6 @@
- $(MAKE) $(AM_MAKEFLAGS) -i out
-
- clean-local:
-- -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) *.texi *.out core.[0-9]*
-+ -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) core.[0-9]*
-
-
---- blitz++-0.9.orig.orig/doc/examples/Makefile.in
-+++ blitz++-0.9.orig/doc/examples/Makefile.in
-@@ -690,7 +690,7 @@
- $(MAKE) $(AM_MAKEFLAGS) -i out
-
- clean-local:
-- -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) *.texi *.out core.[0-9]*
-+ -rm -rf *.ii *.ti cxx_repository Template.dir ii_files ti_files $(EXTRA_PROGRAMS) core.[0-9]*
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- blitz++-0.9.orig.orig/doc/Makefile.am
-+++ blitz++-0.9.orig/doc/Makefile.am
-@@ -88,6 +88,3 @@
-
- .PHONY: html
-
--clean-local:
-- -rm -rf blitz*.html
--
---- blitz++-0.9.orig.orig/doc/Makefile.in
-+++ blitz++-0.9.orig/doc/Makefile.in
-@@ -841,7 +841,7 @@
- .PHONY: html
-
- clean-local:
-- -rm -rf blitz*.html
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/patches/examples.patch b/patches/examples.patch
new file mode 100644
index 0000000..bb7935b
--- /dev/null
+++ b/patches/examples.patch
@@ -0,0 +1,13 @@
+Index: blitz++-0.10/examples/Makefile.am
+===================================================================
+--- blitz++-0.10.orig/examples/Makefile.am 2012-05-26 03:26:02.000000000 +0200
++++ blitz++-0.10/examples/Makefile.am 2012-07-06 11:06:55.000000000 +0200
+@@ -62,7 +62,7 @@
+ check-examples: $(EXTRA_PROGRAMS)
+ @echo Running examples...
+ @for prog in $(EXTRA_PROGRAMS) ; do \
+- echo $$prog && (./$$prog > /dev/null 2>&1) || exit 1; \
++ echo -n $$prog && (./$$prog > /dev/null 2>&1) && echo "\tok" || echo "\tfailed"; \
+ done
+ @echo All tests passed.
+
diff --git a/patches/series b/patches/series
index c7a114a..d342e1d 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,6 @@
-01_gcc_43_missing_includes.patch
-01_gcc34_amd64.patch
-30_fix_doxygen_install_target.patch
-40_prevent_celetion_of_texi_files.patch
+#01_gcc_43_missing_includes.patch
+#01_gcc34_amd64.patch
+#30_fix_doxygen_install_target.patch
+#40_prevent_celetion_of_texi_files.patch
+#testsuite.patch
+examples.patch
diff --git a/patches/testsuite.patch b/patches/testsuite.patch
new file mode 100644
index 0000000..97354f2
--- /dev/null
+++ b/patches/testsuite.patch
@@ -0,0 +1,10 @@
+--- blitz++-0.10.orig/random/discrete-uniform.h.orig 2012-07-06 07:43:39.000000000 +0000
++++ blitz++-0.10/random/discrete-uniform.h 2012-07-06 07:44:30.000000000 +0000
+@@ -32,6 +32,7 @@
+ #ifndef BZ_RANDOM_DISCRETE_UNIFORM_H
+ #define BZ_RANDOM_DISCRETE_UNIFORM_H
+
++#include <blitz/bzdebug.h>
+ #include <random/default.h>
+
+ BZ_NAMESPACE(ranlib)
diff --git a/rules b/rules
index 3eb63c5..9e03326 100755
--- a/rules
+++ b/rules
@@ -2,6 +2,11 @@
# debian/rules for blitz++
# 2011 Andreas Tille <tille at debian.org>
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
version=0.9
libname=libblitz
pkgname=$(libname)0ldbl
@@ -10,30 +15,52 @@ docname=$(libname)-doc
PREFIX = /usr
%:
- dh $@ -with autotools-dev
+ dh $@ -with autotools-dev --parallel
# dh --with autotools-dev --with autoreconf $@ # Needs Build-Depends: dh-autoreconf
override_dh_auto_configure:
- mkdir -p doc_orig
- cp -a doc/blitz.dvi doc/blitz.info doc/blitz.html doc/blitz.pdf doc/blitz.ps doc_orig/
# dh_autotools-dev_updateconfig
- F77=gfortran ./configure --prefix=$(PREFIX) --with-cxx=gcc --with-blas --enable-debug --enable-static --enable-64bit --enable-shared --enable-doxygen CFLAGS="-g -O2 -DBZHAVE_STD" CXXFLAGS="-g -O2 -DBZ_HAVE_STD"
+
+ libtoolize --automake
+ aclocal -Im4
+ autoreconf -i
+ automake
+
+ F77=gfortran ./configure --prefix=$(PREFIX) --with-cxx=gcc --with-blas --enable-debug --enable-static --enable-64bit --enable-shared --enable-doxygen CFLAGS="${CFLAGS} -DBZHAVE_STD" CXXFLAGS="${CXXFLAGS} -DBZ_HAVE_STD"
override_dh_auto_build:
- cp -a doc_orig/* doc/
- dh_auto_build
- cd doc && $(MAKE) all
+ #dh_auto_build
+ #cd doc && $(MAKE) all
+
+ # update doxigen conf file
+ cd doc/doxygen && doxygen -u
+
+ $(MAKE) lib
+ $(MAKE) info #Build Blitz++ texinfo documentation
+
+ mkdir -p doc/doxygen/html
+ $(MAKE) pdf #Build Blitz++ pdf documentation
+ $(MAKE) html #Build Blitz++ html documentation
+override_dh_auto_test:
+ #
+ # TODO find . -name \*.htmlneed to be patched to compile properly
+ #$(MAKE) check-testsuite #Build and check the testsuite
+
+ $(MAKE) check-examples #Build and check the examples
+
+ #$(MAKE) check-benchmarks #Build and check the benchmarks (long)
override_dh_compress:
dh_compress --exclude=examples --exclude=testsuite --exclude=.pdf
override_dh_install:
dh_install
- mkdir -p `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html
- for ext in html gif jpg ; do \
- mv `pwd`/debian/tmp/$(PREFIX)/share/doc/blitz-0.9/*.$${ext} `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html ; \
- done
+
+ #mkdir -p `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html
+ #for ext in html gif jpg ; do \
+ # mv `pwd`/debian/tmp/$(PREFIX)/share/doc/blitz-0.9/*.$${ext} `pwd`/debian/tmp/$(PREFIX)/share/doc/libblitz-doc/html ; \
+ #done
d-shlibmove --ldbl --commit \
--movedev "debian/tmp/usr/lib/pkgconfig/blitz.pc" usr/lib/pkgconfig \
lib/.libs/libblitz.so
@@ -42,12 +69,6 @@ override_dh_install:
# Make sure there will be no *.la file created automagically by d-shlibmove
find debian -name "*.la" -delete
- # Delete copy of jquery.js and replace it by a link (in dh_links) to libjs-jquery version
- rm -f debian/$(docname)/usr/share/doc/$(docname)/html/doxygen/jquery.js
override_dh_clean:
dh_clean
- if [ -d doc_orig ] ; then \
- mv doc_orig/* doc/ ; \
- rmdir doc_orig ; \
- fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/blitz++.git
More information about the debian-science-commits
mailing list