diff -pruN 1:1.0.2+ds-2/debian/adhoc/examples/Makefile 1:1.0.2+ds-3/debian/adhoc/examples/Makefile --- 1:1.0.2+ds-2/debian/adhoc/examples/Makefile 2019-11-02 07:13:08.000000000 +0000 +++ 1:1.0.2+ds-3/debian/adhoc/examples/Makefile 2022-07-30 16:52:48.000000000 +0000 @@ -15,8 +15,8 @@ # for other targets, just read the Makefile. # # written for Debian by Jerome Benoit -# on behalf of the Debian Science Team -# copyright: 2016-2019 Jerome Benoit +# on behalf of the Debian Math Team +# copyright: 2016-2022 Jerome Benoit # distributed under the terms and conditions of GPL version 2 or later # diff -pruN 1:1.0.2+ds-2/debian/adhoc/testsuite/Makefile 1:1.0.2+ds-3/debian/adhoc/testsuite/Makefile --- 1:1.0.2+ds-2/debian/adhoc/testsuite/Makefile 2019-11-02 09:48:54.000000000 +0000 +++ 1:1.0.2+ds-3/debian/adhoc/testsuite/Makefile 2022-07-30 16:52:31.000000000 +0000 @@ -15,8 +15,8 @@ # for other targets, just read the Makefile. # # written for Debian by Jerome Benoit -# on behalf of the Debian Science Team -# copyright: 2016-2019 Jerome Benoit +# on behalf of the Debian Math Team +# copyright: 2016-2022 Jerome Benoit # distributed under the terms and conditions of GPL version 2 or later # diff -pruN 1:1.0.2+ds-2/debian/changelog 1:1.0.2+ds-3/debian/changelog --- 1:1.0.2+ds-2/debian/changelog 2019-11-02 12:55:55.000000000 +0000 +++ 1:1.0.2+ds-3/debian/changelog 2022-07-30 17:23:40.000000000 +0000 @@ -1,3 +1,38 @@ +blitz++ (1:1.0.2+ds-3) unstable; urgency=medium + + [ Jerome Benoit ] + * Debianization: + - Maintenance, migrate to Debian Math Team; + - d/patches/*: + - d/p/debianization.patch, merge patches by Vagrant Cascadian; + - d/p/debianization*.patch, set Forwarded to not-needed; + - d/rules: + - dpkg material, include now; + - harden; + - d/copyright: + - copyright year tuple, update; + - d/upstream/metadata, introduce; + - d/adhoc/*/Makefile: + - copyright year tuple, update. + + [ Philip Rinn ] + * Team work + * debian/control: + - debhelper, bump to 13 + - Standards Version, bump to 4.6.1 (no change) + - Mark libblitz0v5 and libblitz0-dev as 'Multi-Arch: same' + - Mark libblitz-doc as 'Multi-Arch: foreign' + - Add 'Rules-Requires-Root: no' + * Remove unused debian/source/include-binaries + * Make bzconfig.h reproducible: + - Remove -{file|debug}-prefix-map from BZ__compiler_options + - Add patch to use SOURCE_DATE_EPOCH in BZ__config_date (Closes: #977001) + - Thanks Vagrant Cascadian for the patch + - Add patch to use DEB_HOST_MULTIARCH as BZ__os_name (Closes: #977003) + - Thanks Vagrant Cascadian for the patch + + -- Jerome Benoit Sat, 30 Jul 2022 17:23:40 +0000 + blitz++ (1:1.0.2+ds-2) unstable; urgency=medium * Debianization: diff -pruN 1:1.0.2+ds-2/debian/control 1:1.0.2+ds-3/debian/control --- 1:1.0.2+ds-2/debian/control 2019-11-02 08:23:32.000000000 +0000 +++ 1:1.0.2+ds-3/debian/control 2022-07-30 16:43:23.000000000 +0000 @@ -1,21 +1,22 @@ Source: blitz++ -Maintainer: Debian Science Team +Maintainer: Debian Math Team Uploaders: Jerome Benoit , Christophe Trophime Section: devel Priority: optional Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), autoconf-archive, automake, libtool, python3, gfortran | fortran-compiler, cfortran, libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev Build-Depends-Indep: texinfo, texlive-plain-generic, texlive-latex-base -Standards-Version: 4.4.1 +Standards-Version: 4.6.1 +Rules-Requires-Root: no Homepage: https://github.com/blitzpp/blitz -Vcs-Git: https://salsa.debian.org/science-team/blitzxx.git -Vcs-Browser: https://salsa.debian.org/science-team/blitzxx +Vcs-Git: https://salsa.debian.org/math-team/blitzxx.git +Vcs-Browser: https://salsa.debian.org/math-team/blitzxx Package: libblitz0v5 Architecture: any @@ -25,6 +26,7 @@ Suggests: libblitz-doc Conflicts: libblitz0, libblitz0ldbl Provides: libblitz0 Replaces: libblitz0, libblitz0ldbl +Multi-Arch: same Description: C++ template class library for scientific computing Blitz++ offers a high level of abstraction, but performance which rivals Fortran. The @@ -39,6 +41,7 @@ Depends: libblitz0v5 (= ${binary:Version Suggests: pkg-config, libblitz-doc (= ${source:Version}) Conflicts: libblitz-dev, blitz++ Provides: libblitz-dev, blitz++ +Multi-Arch: same Description: C++ template class library for scientific computing - libdev Blitz++ offers a high level of abstraction, but performance which rivals Fortran. The @@ -56,6 +59,7 @@ Suggests: pdf-viewer Enhances: libblitz0-dev (= ${binary:Version}) Breaks: libblitz0ldbl (<< 1:0.10-2) Replaces: libblitz0ldbl (<< 1:0.10-2) +Multi-Arch: foreign Description: C++ template class library for scientific computing - doc Blitz++ offers a high level of abstraction, but performance which rivals Fortran. The diff -pruN 1:1.0.2+ds-2/debian/copyright 1:1.0.2+ds-3/debian/copyright --- 1:1.0.2+ds-2/debian/copyright 2019-11-02 06:35:42.000000000 +0000 +++ 1:1.0.2+ds-3/debian/copyright 2022-07-30 16:12:07.000000000 +0000 @@ -33,7 +33,7 @@ Files: debian/* Copyright: © 1998-2000 John Lapeyre , 2000-2007 Konstantinos Margaritis , 2007-2016 Andreas Tille - 2016-2019 Jerome Benoit + 2016-2022 Jerome Benoit License: GPL-2+ License: Artistic diff -pruN 1:1.0.2+ds-2/debian/libblitz-doc.info 1:1.0.2+ds-3/debian/libblitz-doc.info --- 1:1.0.2+ds-2/debian/libblitz-doc.info 2016-07-22 20:26:47.000000000 +0000 +++ 1:1.0.2+ds-3/debian/libblitz-doc.info 2022-07-30 15:54:53.000000000 +0000 @@ -1 +1 @@ -doc/blitz.info +debian/tmp/usr/share/info/blitz.info diff -pruN 1:1.0.2+ds-2/debian/not-installed 1:1.0.2+ds-3/debian/not-installed --- 1:1.0.2+ds-2/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ 1:1.0.2+ds-3/debian/not-installed 2022-07-30 15:54:53.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libblitz.la diff -pruN 1:1.0.2+ds-2/debian/patches/debianization-examples-neutralization.patch 1:1.0.2+ds-3/debian/patches/debianization-examples-neutralization.patch --- 1:1.0.2+ds-2/debian/patches/debianization-examples-neutralization.patch 2018-06-08 16:00:25.000000000 +0000 +++ 1:1.0.2+ds-3/debian/patches/debianization-examples-neutralization.patch 2022-07-30 16:11:11.000000000 +0000 @@ -4,6 +4,7 @@ Description: debianization: examples: ne This is not a downgrade as this is was present in the previous package but not taken into account. This is a temporary and Debian centric patch. Origin: vendor, Debian +Forwarded: not-needed Author: Jerome Benoit Last-Update: 2018-06-08 diff -pruN 1:1.0.2+ds-2/debian/patches/debianization-examples.patch 1:1.0.2+ds-3/debian/patches/debianization-examples.patch --- 1:1.0.2+ds-2/debian/patches/debianization-examples.patch 2019-11-02 10:14:39.000000000 +0000 +++ 1:1.0.2+ds-3/debian/patches/debianization-examples.patch 2022-07-30 16:30:10.000000000 +0000 @@ -2,6 +2,7 @@ Description: debianization: examples Ad hoc solution to install example material (examples + testsuite); this is a Debian centric patch in order to maintain a minimal d/rules script. Origin: vendor, Debian +Forwarded: not-needed Author: Jerome Benoit Last-Update: 2019-11-02 @@ -42,7 +43,7 @@ Last-Update: 2019-11-02 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) $(BOOST_CPPFLAGS) AM_CXXFLAGS = @CXX_DEBUG_FLAGS@ -DBZ_DEBUG -fpermissive AM_LDFLAGS = $(BOOST_LDFLAGS) -@@ -114,7 +116,13 @@ +@@ -116,7 +118,13 @@ where_SOURCES = where.cpp zeek_1_SOURCES = zeek-1.cpp diff -pruN 1:1.0.2+ds-2/debian/patches/debianization.patch 1:1.0.2+ds-3/debian/patches/debianization.patch --- 1:1.0.2+ds-2/debian/patches/debianization.patch 2018-06-08 16:18:01.000000000 +0000 +++ 1:1.0.2+ds-3/debian/patches/debianization.patch 2022-07-30 16:29:50.000000000 +0000 @@ -2,8 +2,9 @@ Description: debianization Meant to maintain a minimal debian/rules, to fix warnings, to address Debian specific stuff in general. Origin: vendor, Debian +Forwarded: not-needed Author: Jerome Benoit -Last-Update: 2018-06-08 +Last-Update: 2022-07-30 --- a/configure.ac +++ b/configure.ac @@ -66,3 +67,17 @@ Last-Update: 2018-06-08 AM_LDFLAGS = $(BOOST_LDFLAGS) LDADD = $(top_builddir)/lib/libblitz.la $(BOOST_SERIALIZATION_LIB) +--- a/m4/ac_check_cxx_features.m4 ++++ b/m4/ac_check_cxx_features.m4 +@@ -7,9 +7,9 @@ + + ]) + +-OS=`uname -a` ++OS=`dpkg-architecture -qDEB_HOST_MULTIARCH` + AC_SUBST(OS) +-DATE=`date` ++DATE=`LC_ALL=C date --utc --date=@$SOURCE_DATE_EPOCH` + AC_SUBST(DATE) + + AH_TOP([ diff -pruN 1:1.0.2+ds-2/debian/patches/debianization-python.patch 1:1.0.2+ds-3/debian/patches/debianization-python.patch --- 1:1.0.2+ds-2/debian/patches/debianization-python.patch 2019-11-01 20:16:00.000000000 +0000 +++ 1:1.0.2+ds-3/debian/patches/debianization-python.patch 2022-07-30 16:11:29.000000000 +0000 @@ -1,6 +1,7 @@ Description: debianization - Python Meant to address Debian specific stuff concerning Python. Origin: vendor, Debian +Forwarded: not-needed Author: Jerome Benoit Last-Update: 2019-11-02 diff -pruN 1:1.0.2+ds-2/debian/rules 1:1.0.2+ds-3/debian/rules --- 1:1.0.2+ds-2/debian/rules 2018-06-08 17:19:57.000000000 +0000 +++ 1:1.0.2+ds-3/debian/rules 2022-07-30 17:20:08.000000000 +0000 @@ -1,4 +1,5 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk export DEB_BUILD_MAINT_OPTIONS=hardening=+all @@ -6,11 +7,13 @@ export F77 = gfortran CPPFLAGS += -DBZ_HAVE_STD +BUILDDIR=_BUILD + default: @uscan --no-conf --dehs --report || true %: - dh $@ -with autoreconf --builddirectory=_build --no-parallel + dh $@ -with autoreconf --builddirectory=$(BUILDDIR) --no-parallel override_dh_auto_configure: dh_auto_configure -- \ @@ -22,16 +25,20 @@ override_dh_auto_configure: --disable-doxygen override_dh_auto_build-arch: - $(MAKE) -C _build lib + $(MAKE) -C $(BUILDDIR) lib + # Make build reproducible + sed -i \ + -e 's@ [^ ]*-f\(file\|debug\)-prefix-map=[^ ]*@@g' \ + $(BUILDDIR)/blitz/gnu/bzconfig.h override_dh_auto_build-indep: - $(MAKE) -C _build lib - $(MAKE) -C _build info pdf html + $(MAKE) -C $(BUILDDIR) lib + $(MAKE) -C $(BUILDDIR) info pdf html override_dh_auto_test-arch: - $(MAKE) -C _build/examples check - $(MAKE) -C _build/testsuite check - #$(MAKE) -C _build/benchmarks check + $(MAKE) -C $(BUILDDIR)/examples check + $(MAKE) -C $(BUILDDIR)/testsuite check + #$(MAKE) -C $(BUILDDIR)/benchmarks check override_dh_auto_test-indep: @true @@ -40,7 +47,7 @@ override_dh_prep-arch: sed -i \ -e '/^# generated by configure/d' \ -e 's/ -D_FORTIFY_SOURCE=2//;s/ -Wdate-time//;s/: $$/:/;' \ - _build/blitz.pc + $(BUILDDIR)/blitz.pc ## https://bugs.debian.org/726566 override_dh_prep-indep: @@ -50,9 +57,9 @@ override_dh_prep-indep: DEB_AUTO_INSTALL_MAKEFLAGS = DESTDIR=$(CURDIR)/debian/tmp override_dh_auto_install-indep: - $(MAKE) -C _build install-info install-pdf install-html $(DEB_AUTO_INSTALL_MAKEFLAGS) - $(MAKE) -C _build/examples install-examples $(DEB_AUTO_INSTALL_MAKEFLAGS) - $(MAKE) -C _build/testsuite install-testsuite $(DEB_AUTO_INSTALL_MAKEFLAGS) + $(MAKE) -C $(BUILDDIR) install-info install-pdf install-html $(DEB_AUTO_INSTALL_MAKEFLAGS) + $(MAKE) -C $(BUILDDIR)/examples install-examples $(DEB_AUTO_INSTALL_MAKEFLAGS) + $(MAKE) -C $(BUILDDIR)/testsuite install-testsuite $(DEB_AUTO_INSTALL_MAKEFLAGS) override_dh_compress-indep: dh_compress -Xexamples -Xtestsuite -Xbenchmarks -X.pdf diff -pruN 1:1.0.2+ds-2/debian/source/include-binaries 1:1.0.2+ds-3/debian/source/include-binaries --- 1:1.0.2+ds-2/debian/source/include-binaries 2016-07-22 20:26:47.000000000 +0000 +++ 1:1.0.2+ds-3/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/patches/fix_info.patch diff -pruN 1:1.0.2+ds-2/debian/upstream/metadata 1:1.0.2+ds-3/debian/upstream/metadata --- 1:1.0.2+ds-2/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ 1:1.0.2+ds-3/debian/upstream/metadata 2022-07-30 16:56:59.000000000 +0000 @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/blitzpp/blitz/issues +Bug-Submit: https://github.com/blitzpp/blitz/issues/new +Repository: https://github.com/blitzpp/blitz.git +Repository-Browse: https://github.com/blitzpp/blitz