diff -Nru tachyon-0.99~b6+dsx/debian/changelog tachyon-0.99~b6+dsx/debian/changelog --- tachyon-0.99~b6+dsx/debian/changelog 2018-05-13 17:04:33.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/changelog 2018-12-26 16:04:14.000000000 +0000 @@ -1,8 +1,30 @@ -tachyon (0.99~b6+dsx-8build1) cosmic; urgency=medium +tachyon (0.99~b6+dsx-9) unstable; urgency=medium - * No-change rebuild for dune openmpi soname change. + [ Jelmer Vernooij ] + * Change priority extra to optional. - -- Matthias Klose Sun, 13 May 2018 17:04:33 +0000 + [ Jerome Benoit ] + * Debianization: + - debian/copyright: + - Format field, secure; + - Comment field, add; + - Copyright fields, refresh; + - debian/templates/control.in: + - debhelper, bump to 11; + - Standards Version, bump to 4.3.0 (no change); + - Vcs-* fields, migration to salsa; + - Priority fields, update; + - debian/rules: + - include pkg-info.mk; + - percent target, discard --parallel option; + - get-orig-source target, remove; + - debian/clean, harden; + - debian/source/*: + - d/s/lintian-overrides, refresh; + - d/s/options, remove; + - debian/tachyon-doc.{doc-base,links}. + + -- Jerome Benoit Wed, 26 Dec 2018 16:04:14 +0000 tachyon (0.99~b6+dsx-8) unstable; urgency=medium diff -Nru tachyon-0.99~b6+dsx/debian/clean tachyon-0.99~b6+dsx/debian/clean --- tachyon-0.99~b6+dsx/debian/clean 2014-11-14 15:18:31.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/clean 2018-12-26 16:01:20.000000000 +0000 @@ -7,6 +7,7 @@ docs/tachyon/node*.html docs/tachyon/images.* docs/tachyon/*.png +docs/tachyon/*.svg docs/tachyon/internals.pl docs/tachyon/labels.pl scenes/*.jpg diff -Nru tachyon-0.99~b6+dsx/debian/compat tachyon-0.99~b6+dsx/debian/compat --- tachyon-0.99~b6+dsx/debian/compat 2014-11-14 15:10:00.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/compat 2018-12-26 15:25:22.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru tachyon-0.99~b6+dsx/debian/control tachyon-0.99~b6+dsx/debian/control --- tachyon-0.99~b6+dsx/debian/control 2017-02-24 04:27:21.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/control 2018-12-26 15:37:24.000000000 +0000 @@ -4,8 +4,8 @@ Maintainer: Debian Science Maintainers Uploaders: Jerome Benoit Build-Depends: - debhelper (>= 9), - autotools-dev, autoconf-archive (>= 20160916), gnulib, dh-autoreconf, libtool, + debhelper (>= 11), + autoconf-archive, gnulib, libtool, pkg-config, help2man, mpi-default-dev (>= 1.6), libopenmpi-dev, libmpich-dev, libjpeg-dev, libpng-dev, @@ -17,15 +17,14 @@ texlive-science, texlive-humanities, latex2html, rdfind, symlinks -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 Homepage: http://jedi.ks.uiuc.edu/~johns/raytracer/ -Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/tachyon.git -Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/tachyon.git +Vcs-Git: https://salsa.debian.org/science-team/tachyon.git +Vcs-Browser: https://salsa.debian.org/science-team/tachyon Package: libtachyon-serial-0 Provides: libtachyon Section: libs -Priority: extra Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -52,7 +51,6 @@ Package: libtachyon-serial-0-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: any Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-serial-0 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same @@ -126,7 +124,6 @@ Package: libtachyon-openmpi-0 Provides: libtachyon Section: libs -Priority: extra Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64 x32 Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -153,7 +150,6 @@ Package: libtachyon-openmpi-0-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64 x32 Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi-0 (= ${binary:Version}), libopenmpi-dev, ${misc:Depends} Multi-Arch: same @@ -177,7 +173,6 @@ Package: libtachyon-mpich-0 Provides: libtachyon Section: libs -Priority: extra Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32 Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -204,7 +199,6 @@ Package: libtachyon-mpich-0-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32 Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-mpich-0 (= ${binary:Version}), libmpich-dev, ${misc:Depends} Multi-Arch: same @@ -250,7 +244,6 @@ Package: libtachyon-mpi-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: any Depends: ${default:libtachyon-mpi-dev}, mpi-default-dev, ${misc:Depends} Description: Parallel/Multiprocessor Ray Tracing Library - development - default MPI flavour diff -Nru tachyon-0.99~b6+dsx/debian/copyright tachyon-0.99~b6+dsx/debian/copyright --- tachyon-0.99~b6+dsx/debian/copyright 2016-08-01 01:03:12.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/copyright 2018-12-26 15:11:02.000000000 +0000 @@ -1,11 +1,15 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: tachyon Upstream-Contact: John E. Stone Source: http://jedi.ks.uiuc.edu/~johns/raytracer/ +Comment: + The upstream source tarball is repacked to drop off some substantial weight + by wiping out included third-party material and to add some extra material + needed for documentation and as samples. Files: * Copyright: - 1994-2015 John E. Stone + 1994-2018 John E. Stone License: BSD-3-clause Files: demosrc/trackball.* @@ -60,7 +64,7 @@ Files: debian/* Copyright: - 2014-2015 Jerome Benoit + 2014-2018 Jerome Benoit 2008 Tim Abbott License: GPL-3+ Comment: diff -Nru tachyon-0.99~b6+dsx/debian/rules tachyon-0.99~b6+dsx/debian/rules --- tachyon-0.99~b6+dsx/debian/rules 2017-02-24 13:28:15.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/rules 2018-12-26 15:40:53.000000000 +0000 @@ -1,8 +1,9 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk export DEB_BUILD_MAINT_OPTIONS=hardening=+all -export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -S Version) +export DEB_PKG_VERSION = $(DEB_VERSION) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -59,7 +60,7 @@ @uscan --no-conf --dehs --report || true %: - dh $@ --with autoreconf --parallel + dh $@ --with autoreconf override_dh_auto_configure: $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \ @@ -151,9 +152,6 @@ $(MAKE) -C pkgextra/volpack/data distclean || true $(MAKE) -C pkgextra/virtual-reality/graphics distclean || true -get-orig-source: - uscan --no-conf --download-current-version --verbose - update-debian-control: debian/templates/control.in debian/rules debian/templates/control-description-mainpart.rin sed \ -e "s|@LT_CURRENT@|$(DEB_PKG_LT_CURRENT)|g" \ diff -Nru tachyon-0.99~b6+dsx/debian/source/lintian-overrides tachyon-0.99~b6+dsx/debian/source/lintian-overrides --- tachyon-0.99~b6+dsx/debian/source/lintian-overrides 2014-11-14 15:10:00.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/source/lintian-overrides 2018-12-26 14:59:31.000000000 +0000 @@ -1 +1 @@ -debian-watch-may-check-gpg-signature +debian-watch-does-not-check-gpg-signature diff -Nru tachyon-0.99~b6+dsx/debian/source/options tachyon-0.99~b6+dsx/debian/source/options --- tachyon-0.99~b6+dsx/debian/source/options 2014-11-14 15:10:00.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -compression = xz -compression-level = 9 diff -Nru tachyon-0.99~b6+dsx/debian/tachyon-doc.doc-base tachyon-0.99~b6+dsx/debian/tachyon-doc.doc-base --- tachyon-0.99~b6+dsx/debian/tachyon-doc.doc-base 2014-11-14 15:10:00.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/tachyon-doc.doc-base 2018-12-26 15:33:15.000000000 +0000 @@ -9,8 +9,8 @@ Section: Science/Mathematics Format: HTML -Index: /usr/share/doc/tachyon-doc/html/index.html -Files: /usr/share/doc/tachyon-doc/html/*.html +Index: /usr/share/doc/tachyon/html/index.html +Files: /usr/share/doc/tachyon/html/*.html Format: PDF -Files: /usr/share/doc/tachyon-doc/tachyon.pdf +Files: /usr/share/doc/tachyon/tachyon.pdf diff -Nru tachyon-0.99~b6+dsx/debian/tachyon-doc.links tachyon-0.99~b6+dsx/debian/tachyon-doc.links --- tachyon-0.99~b6+dsx/debian/tachyon-doc.links 2014-11-14 15:10:00.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/tachyon-doc.links 2018-12-26 15:35:46.000000000 +0000 @@ -1,5 +1,5 @@ -usr/share/doc/tachyon-doc/examples/scenes/imaps usr/share/doc/tachyon-doc/examples/demosrc/imaps -usr/share/doc/tachyon-doc/examples/scenes/tpoly usr/share/doc/tachyon-doc/examples/demosrc/tpoly -usr/share/doc/tachyon-doc/examples/scenes/vol usr/share/doc/tachyon-doc/examples/demosrc/vol -usr/share/doc/tachyon-doc/examples/scenes/action.sh usr/share/doc/tachyon-doc/examples/scenes/clean.sh -usr/share/doc/tachyon-doc/examples/scenes/vol/brain.256x256x109 usr/share/doc/tachyon-doc/examples/scenes/vol/head.256x256x109 +usr/share/doc/tachyon/examples/scenes/imaps usr/share/doc/tachyon/examples/demosrc/imaps +usr/share/doc/tachyon/examples/scenes/tpoly usr/share/doc/tachyon/examples/demosrc/tpoly +usr/share/doc/tachyon/examples/scenes/vol usr/share/doc/tachyon/examples/demosrc/vol +usr/share/doc/tachyon/examples/scenes/action.sh usr/share/doc/tachyon/examples/scenes/clean.sh +usr/share/doc/tachyon/examples/scenes/vol/brain.256x256x109 usr/share/doc/tachyon/examples/scenes/vol/head.256x256x109 diff -Nru tachyon-0.99~b6+dsx/debian/templates/control.in tachyon-0.99~b6+dsx/debian/templates/control.in --- tachyon-0.99~b6+dsx/debian/templates/control.in 2017-02-24 04:19:35.000000000 +0000 +++ tachyon-0.99~b6+dsx/debian/templates/control.in 2018-12-26 15:26:21.000000000 +0000 @@ -4,8 +4,8 @@ Maintainer: Debian Science Maintainers Uploaders: Jerome Benoit Build-Depends: - debhelper (>= 9), - autotools-dev, autoconf-archive (>= 20160916), gnulib, dh-autoreconf, libtool, + debhelper (>= 11), + autoconf-archive, gnulib, libtool, pkg-config, help2man, mpi-default-dev (>= 1.6), libopenmpi-dev, libmpich-dev, libjpeg-dev, libpng-dev, @@ -17,15 +17,14 @@ texlive-science, texlive-humanities, latex2html, rdfind, symlinks -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 Homepage: http://jedi.ks.uiuc.edu/~johns/raytracer/ -Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/tachyon.git -Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/tachyon.git +Vcs-Git: https://salsa.debian.org/science-team/tachyon.git +Vcs-Browser: https://salsa.debian.org/science-team/tachyon Package: libtachyon-serial-@LT_CURRENT@ Provides: libtachyon Section: libs -Priority: extra Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -42,7 +41,6 @@ Package: libtachyon-serial-@LT_CURRENT@-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: any Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-serial-@LT_CURRENT@ (= ${binary:Version}), ${misc:Depends} Multi-Arch: same @@ -86,7 +84,6 @@ Package: libtachyon-openmpi-@LT_CURRENT@ Provides: libtachyon Section: libs -Priority: extra Architecture: @ARCH_REVLISTOF_OPENMPI@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -103,7 +100,6 @@ Package: libtachyon-openmpi-@LT_CURRENT@-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: @ARCH_REVLISTOF_OPENMPI@ Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-openmpi-@LT_CURRENT@ (= ${binary:Version}), libopenmpi-dev, ${misc:Depends} Multi-Arch: same @@ -117,7 +113,6 @@ Package: libtachyon-mpich-@LT_CURRENT@ Provides: libtachyon Section: libs -Priority: extra Architecture: @ARCH_REVLISTOF_MPICH@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -134,7 +129,6 @@ Package: libtachyon-mpich-@LT_CURRENT@-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: @ARCH_REVLISTOF_MPICH@ Depends: libtachyon-dev-common (= ${source:Version}), libtachyon-mpich-@LT_CURRENT@ (= ${binary:Version}), libmpich-dev, ${misc:Depends} Multi-Arch: same @@ -160,7 +154,6 @@ Package: libtachyon-mpi-dev Provides: libtachyon-dev Section: libdevel -Priority: extra Architecture: any Depends: ${@LIBTACHYON_MPI_DEFAULT_DEV@}, mpi-default-dev, ${misc:Depends} Description: @SYNOPSIS_LIBRARY@ - development - default MPI flavour