[tachyon] 01/01: Imported Debian patch 0.99~b6+dsx-5: refreshment
Jerome Benoit
calculus-guest at moszumanska.debian.org
Mon Aug 1 03:19:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository tachyon.
commit f8e77d62105991ab5876e4f040631115528c197a
Author: Jerome Benoit <calculus at rezozer.net>
Date: Mon Aug 1 01:14:54 2016 +0100
Imported Debian patch 0.99~b6+dsx-5: refreshment
---
debian/changelog | 20 ++++
debian/control | 115 +++------------------
debian/copyright | 2 +-
debian/patches/debianization.patch | 2 +-
debian/patches/series | 1 +
.../upstream-lintian-spelling-error-silence.patch | 108 +++++++++++++++++++
debian/rules | 44 ++++----
debian/templates/control.in | 67 ++----------
.../libtachyon-LIBFLAVOUR-dev.maintscript.in | 1 +
9 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 687180f..c86312a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+tachyon (0.99~b6+dsx-5) unstable; urgency=medium
+
+ * Debianization:
+ - debian/control:
+ - Standards Version 3.9.8, bump;
+ - description field appendum for serial platforms library, correct
+ (thanks to Katsuhiko Nishimra <ktns.87 at gmail.com> for noticing;
+ Closes: #824134);
+ - discard the debug symbols packages;
+ - revisit;
+ - debian/rules:
+ - dpkg-buildflags, add hardening=+all;
+ - discard the debug symbols material (see above);
+ - symlink policy for documentation directories, set;
+ - refresh;
+ - debian/patches/upstream-lintian-spelling-error-silence.patch, introduce
+ (and submit).
+
+ -- Jerome Benoit <calculus at rezozer.net> Mon, 01 Aug 2016 01:23:27 +0000
+
tachyon (0.99~b6+dsx-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 74f07f0..92808af 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
- mpi-default-dev (>= 1.3),
+ mpi-default-dev (>= 1.6),
libmpich-dev,
libjpeg-dev,
libpng-dev,
@@ -18,7 +18,7 @@ Build-Depends-Indep:
texlive-science, texlive-humanities,
latex2html,
rdfind, symlinks
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
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
@@ -46,7 +46,7 @@ Description: Parallel/Multiprocessor Ray Tracing Library - runtime - serial flav
animation and scientific visualization tasks.
.
This package provides the shared library required to run third party
- program compiled against the tachyon C library built against OpenMPI.
+ program compiled against the tachyon C library built for serial platforms.
To compile your own programs you also need to install the concomitant
libtachyon-serial-0-dev package.
@@ -74,29 +74,6 @@ Description: Parallel/Multiprocessor Ray Tracing Library - development - serial
third party developers using the tachyon C library built for serial
platforms.
-Package: libtachyon-serial-0-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
-Depends: libtachyon-serial-0 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Parallel/Multiprocessor Ray Tracing Library - debug package - serial flavour
- Tachyon is a portable, high performance parallel ray tracing system
- supporting MPI and multithreaded implementations. Tachyon is built as
- a C callable library, which can be used within applications.
- .
- Tachyon implements all of the basic geometric primitives such as
- triangles, planes, spheres, cylinders, etc. Some of the goals in
- developing Tachyon were to make it fast and for it to parallelize
- well. These are what set it apart from more full-featured programs
- like POV-Ray, Rayshade, and others. Tachyon supports enough features
- to be an excellent alternative to slower programs for demanding
- animation and scientific visualization tasks.
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-serial-0-dev package.
-
Package: libtachyon-mt-0
Provides: libtachyon
Replaces: libtachyon-0.99
@@ -147,34 +124,11 @@ Description: Parallel/Multiprocessor Ray Tracing Library - development - MT flav
third party developers using the tachyon C library built with
multithreading will need.
-Package: libtachyon-mt-0-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libtachyon-mt-0 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Parallel/Multiprocessor Ray Tracing Library - debug package - MT flavour
- Tachyon is a portable, high performance parallel ray tracing system
- supporting MPI and multithreaded implementations. Tachyon is built as
- a C callable library, which can be used within applications.
- .
- Tachyon implements all of the basic geometric primitives such as
- triangles, planes, spheres, cylinders, etc. Some of the goals in
- developing Tachyon were to make it fast and for it to parallelize
- well. These are what set it apart from more full-featured programs
- like POV-Ray, Rayshade, and others. Tachyon supports enough features
- to be an excellent alternative to slower programs for demanding
- animation and scientific visualization tasks.
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-mt-0-dev package.
-
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 ppc64 ppc64el s390x sh4 sparc64 x32
+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}
Suggests: tachyon-doc
@@ -201,7 +155,7 @@ 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 ppc64 ppc64el s390x sh4 sparc64 x32
+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}), ${misc:Depends}
Multi-Arch: same
Description: Parallel/Multiprocessor Ray Tracing Library - development - OpenMPI flavour
@@ -221,34 +175,11 @@ Description: Parallel/Multiprocessor Ray Tracing Library - development - OpenMPI
third party developers using the tachyon C library built against
OpenMPI will need.
-Package: libtachyon-openmpi-0-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64 x32
-Depends: libtachyon-openmpi-0 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Parallel/Multiprocessor Ray Tracing Library - debug package - OpenMPI flavour
- Tachyon is a portable, high performance parallel ray tracing system
- supporting MPI and multithreaded implementations. Tachyon is built as
- a C callable library, which can be used within applications.
- .
- Tachyon implements all of the basic geometric primitives such as
- triangles, planes, spheres, cylinders, etc. Some of the goals in
- developing Tachyon were to make it fast and for it to parallelize
- well. These are what set it apart from more full-featured programs
- like POV-Ray, Rayshade, and others. Tachyon supports enough features
- to be an excellent alternative to slower programs for demanding
- animation and scientific visualization tasks.
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-openmpi-0-dev package.
-
Package: libtachyon-mpich-0
Provides: libtachyon
Section: libs
Priority: extra
-Architecture: any
+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}
Suggests: tachyon-doc
@@ -275,7 +206,7 @@ Package: libtachyon-mpich-0-dev
Provides: libtachyon-dev
Section: libdevel
Priority: extra
-Architecture: any
+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}), ${misc:Depends}
Multi-Arch: same
Description: Parallel/Multiprocessor Ray Tracing Library - development - MPICH flavour
@@ -295,29 +226,6 @@ Description: Parallel/Multiprocessor Ray Tracing Library - development - MPICH f
third party developers using the tachyon C library built against
MPICH will need.
-Package: libtachyon-mpich-0-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libtachyon-mpich-0 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: Parallel/Multiprocessor Ray Tracing Library - debug package - MPICH flavour
- Tachyon is a portable, high performance parallel ray tracing system
- supporting MPI and multithreaded implementations. Tachyon is built as
- a C callable library, which can be used within applications.
- .
- Tachyon implements all of the basic geometric primitives such as
- triangles, planes, spheres, cylinders, etc. Some of the goals in
- developing Tachyon were to make it fast and for it to parallelize
- well. These are what set it apart from more full-featured programs
- like POV-Ray, Rayshade, and others. Tachyon supports enough features
- to be an excellent alternative to slower programs for demanding
- animation and scientific visualization tasks.
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-mpich-0-dev package.
-
Package: libtachyon-dev-common
Section: libdevel
Architecture: all
@@ -385,7 +293,7 @@ Package: tachyon-bin-nox
Provides: tachyon-bin
Breaks: tachyon (<< 0.99~b6)
Architecture: any
-Depends: libtachyon-mt-0 (= ${binary:Version}) | libtachyon, ${shlibs:Depends}, ${misc:Depends}
+Depends: libtachyon-mt-0 (= ${binary:Version}) | libtachyon, ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
Description: Parallel/Multiprocessor Standalone Ray Tracer - with no X support
Tachyon is a portable, high performance parallel ray tracing system
@@ -403,7 +311,6 @@ Description: Parallel/Multiprocessor Standalone Ray Tracer - with no X support
This package provides a simple scene file parser front-end built upon
tachyon but without X support.
-
Package: tachyon-bin-ogl
Provides: tachyon-bin
Breaks: tachyon (<< 0.99~b6)
@@ -430,7 +337,11 @@ Package: tachyon-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: libtachyon-dev, tachyon-bin
+Enhances:
+ libtachyon-dev, tachyon-bin,
+ libtachyon-serial-0, libtachyon-mt-0,
+ libtachyon-openmpi-0, libtachyon-mpich-0
+Suggests: pdf-viewer
Multi-Arch: foreign
Description: Parallel/Multiprocessor Ray Tracing System - reference manual
Tachyon is a portable, high performance parallel ray tracing system
diff --git a/debian/copyright b/debian/copyright
index cceede4..8137768 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,7 +46,7 @@ Copyright:
1994 Phil Lacrout <volpack at graphics.stanford.edu>
License: public-domain-vp-chvrtd
These data files constains volume data derived from an MR scan of a human head;
- the data are in .den format and has been been compressed.
+ the data are in .den format and has been compressed.
.
The original MR scan is from the Chapel Hill Volume Rendering Test Dataset,
Volume I, formally available from <ftp://omicron.cs.unc.edu/pub/softlab/CHVRTD/volI/>.
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 9e69117..cc24f7e 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -103,7 +103,7 @@ Last-Update: 2014-10-20
EXTRA_DIST =
--- a/configure.ac
+++ b/configure.ac
-@@ -54,10 +54,11 @@
+@@ -58,10 +58,11 @@
## PNG library
PKG_CHECK_MODULES([LIBPNG],[libpng],[CPPFLAGS="$CPPFLAGS -DUSEPNG"],[AC_MSG_ERROR([unable to find libpng])])
## OpenGL
diff --git a/debian/patches/series b/debian/patches/series
index 3930c31..959b8c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-lintian-spelling-error-silence.patch
upstream-pthreads.patch
upstream-parse-tpoly.patch
upstream-opengl.patch
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
new file mode 100644
index 0000000..3abe5e9
--- /dev/null
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -0,0 +1,108 @@
+Description: source typo
+ Correct spelling error as reported by lintian in some binraries;
+ meant to silence lintian and eventually to be submitted to the
+ upstream maintainer.
+Origin: debian
+Forwarded: by email
+Comment: spelling-error-in-binary
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-08-01
+
+--- a/demosrc/parse.c
++++ b/demosrc/parse.c
+@@ -174,7 +174,7 @@
+
+ streampos = ftell(ph->ifp);
+
+- /* count lines up to approximate position where error occured */
++ /* count lines up to approximate position where error occurred */
+ fseek(ph->ifp, 0, SEEK_SET);
+
+ i=0;
+@@ -199,7 +199,7 @@
+ printf(" Encountered a syntax error in file %s\n", ph->filename);
+ printf(" Expected to find %s\n", string);
+ printf(" Actually found: %s\n", found);
+- printf(" Error occured at or prior to file offset %ld, line %ld\n",
++ printf(" Error occurred at or prior to file offset %ld, line %ld\n",
+ streampos, linecount);
+ printf(" Error position is only approximate, but should be close\n\n");
+
+@@ -719,7 +719,7 @@
+ }
+
+ if (n != 3 ) {
+- rc |= PARSEBADSYNTAX; /* unparsed hex color occured */
++ rc |= PARSEBADSYNTAX; /* unparsed hex color occurred */
+ }
+
+ /* save RGB data to texture map */
+--- a/demosrc/glwin.c
++++ b/demosrc/glwin.c
+@@ -727,7 +727,7 @@
+ enum SpwRetVal res;
+ res = SiClose(handle->sball); /* close spaceball device */
+ if (res != SPW_NO_ERROR)
+- printf("An error occured during Spaceball shutdown.\n");
++ printf("An error occurred during Spaceball shutdown.\n");
+ SiTerminate(); /* shutdown spaceware input library */
+ }
+
+--- a/src/threads.c
++++ b/src/threads.c
+@@ -1692,7 +1692,7 @@
+ }
+
+
+-/* worker thread calls this to indicate that an unrecoverable error occured */
++/* worker thread calls this to indicate that an unrecoverable error occurred */
+ int rt_threadpool_setfatalerror(void *voidparms) {
+ rt_threadpool_workerdata_t *worker = (rt_threadpool_workerdata_t *) voidparms;
+ rt_shared_iterator_setfatalerror(worker->iter);
+@@ -1700,7 +1700,7 @@
+ }
+
+
+-/* worker thread calls this to indicate that an unrecoverable error occured */
++/* worker thread calls this to indicate that an unrecoverable error occurred */
+ int rt_threadpool_getfatalerror(void *voidparms) {
+ rt_threadpool_workerdata_t *worker = (rt_threadpool_workerdata_t *) voidparms;
+ /* query error status for return to caller */
+@@ -1816,7 +1816,7 @@
+ }
+
+
+-/** worker thread calls this to indicate that an unrecoverable error occured */
++/** worker thread calls this to indicate that an unrecoverable error occurred */
+ int rt_threadlaunch_setfatalerror(void *voidparms) {
+ rt_threadlaunch_t *worker = (rt_threadlaunch_t *) voidparms;
+ return rt_shared_iterator_setfatalerror(worker->iter);
+--- a/src/threads.h
++++ b/src/threads.h
+@@ -362,7 +362,7 @@
+ /**
+ * iterate the shared iterator with a requested tile size,
+ * returns the tile received, and a return code of -1 if no
+- * iterations left or a fatal error has occured during processing,
++ * iterations left or a fatal error has occurred during processing,
+ * canceling all worker threads.
+ */
+ int rt_shared_iterator_next_tile(rt_shared_iterator_t *it, int reqsize,
+@@ -468,7 +468,7 @@
+ */
+ int rt_threadpool_tile_failed(void *thrpool, rt_tasktile_t *tile);
+
+-/** worker thread calls this to indicate that an unrecoverable error occured */
++/** worker thread calls this to indicate that an unrecoverable error occurred */
+ int rt_threadpool_setfatalerror(void *thrparms);
+
+ /** master thread calls this to query for fatal errors */
+@@ -508,7 +508,7 @@
+ int rt_threadlaunch_next_tile(void *voidparms, int reqsize,
+ rt_tasktile_t *tile);
+
+-/** worker thread calls this to indicate that an unrecoverable error occured */
++/** worker thread calls this to indicate that an unrecoverable error occurred */
+ int rt_threadlaunch_setfatalerror(void *thrparms);
+
+
diff --git a/debian/rules b/debian/rules
index 5d006b7..a3a0113 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
-DEB_PKG_DIR = $(abspath $(dir $(filter %rules, $(MAKEFILE_LIST))))
-export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog -S Version)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -S Version)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -14,7 +15,7 @@ endif
DEB_VIRT_LIBTACHYON_LISTOF_VARIANT = serial mt-openmp mt-thr openmpi-openmp openmpi-thr openmpi mpich-openmp mpich-thr mpich
DEB_VIRT_LIBTACHYON_VARIANT_LISTOF_DHFILE = .symbols .install -dev.install
DEB_VIRT_LIBTACHYON_FLAVOUR_LISTOF_DHFILE = \
- $(DEB_VIRT_LIBTACHYON_VARIANT_LISTOF_DHFILE) .lintian-overrides .postinst .prerm -dev.postinst -dev.prerm
+ $(DEB_VIRT_LIBTACHYON_VARIANT_LISTOF_DHFILE) .lintian-overrides .postinst .prerm -dev.postinst -dev.prerm -dev.maintscript
DEB_VIRT_TACHYON_LISTOF_VARIANT = nox ogl
DEB_VIRT_TACHYON_LISTOF_DHFILE = .install .manpages .postinst .prerm
@@ -30,11 +31,12 @@ ifneq (,$(wildcard /usr/share/mpi-default-dev/debian_defaults))
include /usr/share/mpi-default-dev/debian_defaults
DEB_ARCH_DEFAULT_MPI_IMPL = $(ARCH_DEFAULT_MPI_IMPL)
DEB_ARCH_REVLISTOF_OPENMPI ?= $(strip $(OPENMPI_AVAILABLE_ARCHITECTURES))
+DEB_ARCH_REVLISTOF_MPICH ?= $(strip $(MPICH_AVAILABLE_ARCHITECTURES))
else
DEB_ARCH_DEFAULT_MPI_IMPL = mpich
DEB_ARCH_REVLISTOF_OPENMPI ?= any
-endif
DEB_ARCH_REVLISTOF_MPICH ?= any
+endif
## inspired from mpfr material
@@ -60,11 +62,11 @@ default:
override_dh_auto_configure:
$(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \
- dh_auto_configure -B _build/$(lf) -- --srcdir=../.. --with-libflavour=$(lf) CFLAGS="$(CFLAGS)" CC=$(CC_$(lf)) ;\
+ dh_auto_configure -B _build/$(lf) -- --srcdir=../.. --with-libflavour=$(lf) CFLAGS="$(CFLAGS)" CC=$(CC_$(lf)) $(NEWLINE)\
)
override_dh_auto_build-arch:
- $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), dh_auto_build -a -B _build/$(lf) ;)
+ $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), dh_auto_build -a -B _build/$(lf) $(NEWLINE))
override_dh_auto_build-indep:
$(MAKE) -C docs all
@@ -83,7 +85,7 @@ override_dh_prep-arch:
-e "s|@LISTOF_LIBVARIANTSONAME@|$(addsuffix $(DEB_PKG_LT_CURRENT), $(addprefix libtachyon-, $(filter $(lf)%, $(DEB_VIRT_LIBTACHYON_LISTOF_VARIANT))))|g" \
-e "/##CaseTableOfLibraryPriorities##/r debian/templates/libtachyon-LIBFLAVOUR-casetableof_priority.rin" \
-e "/##CaseTableOfLibraryPriorities##/d" \
- debian/templates/libtachyon-LIBFLAVOUR$(dhf).in > debian/libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)$(dhf) ;\
+ debian/templates/libtachyon-LIBFLAVOUR$(dhf).in > debian/libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)$(dhf) $(NEWLINE)\
) \
)
$(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \
@@ -94,14 +96,14 @@ override_dh_prep-arch:
-e "s|@LT_CURRENT@|$(DEB_PKG_LT_CURRENT)|g;s|@LT_REVISION@|$(DEB_PKG_LT_REVISION)|g;s|@LT_AGE@|$(DEB_PKG_LT_AGE)|g" \
-e "s|@LIBFLAVOUR@|$(lf)|g" \
-e "s|@LIBVARIANT@|$(lv)|g" \
- debian/templates/libtachyon-LIBVARIANT$(dhf).in >> debian/libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)$(dhf) ;\
+ debian/templates/libtachyon-LIBVARIANT$(dhf).in >> debian/libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)$(dhf) $(NEWLINE)\
) \
) \
)
$(foreach vt, $(DEB_VIRT_TACHYON_LISTOF_VARIANT), \
$(foreach dhf, $(DEB_VIRT_TACHYON_LISTOF_DHFILE), \
sed -e "s|@VARIANT@|$(vt)|g" \
- debian/templates/tachyon-bin-VARIANT$(dhf).in > debian/tachyon-bin-$(vt)$(dhf) ;\
+ debian/templates/tachyon-bin-VARIANT$(dhf).in > debian/tachyon-bin-$(vt)$(dhf) $(NEWLINE)\
) \
)
dh_prep -a
@@ -114,7 +116,7 @@ override_dh_prep-indep:
dh_prep -i
override_dh_auto_install-arch:
- $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), dh_auto_install -a -B _build/$(lf) ;)
+ $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), dh_auto_install -a -B _build/$(lf) $(NEWLINE))
DEB_AUTO_INSTALL_MAKEFLAGS = TOPSRCDIR=$(CURDIR) DESTDIR=$(CURDIR)/debian/tmp
override_dh_auto_install-indep:
@@ -123,6 +125,12 @@ override_dh_auto_install-indep:
$(MAKE) -C pkgextra/volpack/data install $(DEB_AUTO_INSTALL_MAKEFLAGS)
$(MAKE) -C pkgextra/virtual-reality/graphics install $(DEB_AUTO_INSTALL_MAKEFLAGS)
+override_dh_installdocs:
+ $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \
+ dh_installdocs -plibtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)-dev --link-doc=libtachyon-dev-common $(NEWLINE)\
+ )
+ dh_installdocs --remaining-packages
+
override_dh_compress-indep:
dh_compress -X.pdf -Xexamples
@@ -148,12 +156,6 @@ override_dh_auto_clean-indep:
$(MAKE) -C pkgextra/volpack/data distclean || true
$(MAKE) -C pkgextra/virtual-reality/graphics distclean || true
-override_dh_strip-arch:
- $(foreach vt, $(DEB_VIRT_TACHYON_LISTOF_VARIANT), dh_strip --package=tachyon-bin-$(vt) ;)
- $(foreach lf, $(DEB_VIRT_LIBTACHYON_LISTOF_FLAVOUR), \
- dh_strip --package=libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT) --dbg-package=libtachyon-$(lf)-$(DEB_PKG_LT_CURRENT)-dbg ;\
- )
-
get-orig-source:
uscan --no-conf --download-current-version --verbose
@@ -164,11 +166,17 @@ update-debian-control: debian/templates/control.in debian/rules debian/templates
-e "s|@ARCH_REVLISTOF_OPENMPI@|$(DEB_ARCH_REVLISTOF_OPENMPI)|g" \
-e "s|@ARCH_REVLISTOF_MPICH@|$(DEB_ARCH_REVLISTOF_MPICH)|g" \
-e "s|@SYNOPSIS_LIBRARY@|Parallel/Multiprocessor Ray Tracing Library|g" \
- -e "s|@SYNOPSIS_TOOLS@|Parallel/Multiprocessor Standalone Ray Tracer|g" \
- -e "s|@SYNOPSIS_MANUAL@|Parallel/Multiprocessor Ray Tracing System|g" \
+ -e "s|@SYNOPSIS_TOOLS@|Parallel/Multiprocessor Standalone Ray Tracer|g" \
+ -e "s|@SYNOPSIS_MANUAL@|Parallel/Multiprocessor Ray Tracing System|g" \
-e "/##DescriptionMainPart##/r $(lastword $^)" \
-e "/##DescriptionMainPart##/d" \
$< > debian/control
+
+define NEWLINE
+
+
+endef
+
EMPTY :=
EMPTY +=
diff --git a/debian/templates/control.in b/debian/templates/control.in
index fe0467b..3d0869f 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -6,7 +6,7 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9),
autotools-dev, autoconf-archive, dh-autoreconf, libtool, pkg-config, help2man,
- mpi-default-dev (>= 1.3),
+ mpi-default-dev (>= 1.6),
libmpich-dev,
libjpeg-dev,
libpng-dev,
@@ -18,7 +18,7 @@ Build-Depends-Indep:
texlive-science, texlive-humanities,
latex2html,
rdfind, symlinks
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
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
@@ -36,7 +36,7 @@ Description: @SYNOPSIS_LIBRARY@ - runtime - serial flavour
##DescriptionMainPart##
.
This package provides the shared library required to run third party
- program compiled against the tachyon C library built against OpenMPI.
+ program compiled against the tachyon C library built for serial platforms.
To compile your own programs you also need to install the concomitant
libtachyon-serial- at LT_CURRENT@-dev package.
@@ -54,19 +54,6 @@ Description: @SYNOPSIS_LIBRARY@ - development - serial flavour
third party developers using the tachyon C library built for serial
platforms.
-Package: libtachyon-serial- at LT_CURRENT@-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: @ARCH_REVLISTOF_OPENMPI@
-Depends: libtachyon-serial- at LT_CURRENT@ (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: @SYNOPSIS_LIBRARY@ - debug package - serial flavour
- ##DescriptionMainPart##
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-serial- at LT_CURRENT@-dev package.
-
Package: libtachyon-mt- at LT_CURRENT@
Provides: libtachyon
Replaces: libtachyon-0.99
@@ -97,19 +84,6 @@ Description: @SYNOPSIS_LIBRARY@ - development - MT flavour
third party developers using the tachyon C library built with
multithreading will need.
-Package: libtachyon-mt- at LT_CURRENT@-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libtachyon-mt- at LT_CURRENT@ (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: @SYNOPSIS_LIBRARY@ - debug package - MT flavour
- ##DescriptionMainPart##
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-mt- at LT_CURRENT@-dev package.
-
Package: libtachyon-openmpi- at LT_CURRENT@
Provides: libtachyon
Section: libs
@@ -141,19 +115,6 @@ Description: @SYNOPSIS_LIBRARY@ - development - OpenMPI flavour
third party developers using the tachyon C library built against
OpenMPI will need.
-Package: libtachyon-openmpi- at LT_CURRENT@-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: @ARCH_REVLISTOF_OPENMPI@
-Depends: libtachyon-openmpi- at LT_CURRENT@ (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: @SYNOPSIS_LIBRARY@ - debug package - OpenMPI flavour
- ##DescriptionMainPart##
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-openmpi- at LT_CURRENT@-dev package.
-
Package: libtachyon-mpich- at LT_CURRENT@
Provides: libtachyon
Section: libs
@@ -185,19 +146,6 @@ Description: @SYNOPSIS_LIBRARY@ - development - MPICH flavour
third party developers using the tachyon C library built against
MPICH will need.
-Package: libtachyon-mpich- at LT_CURRENT@-dbg
-Provides: libtachyon-dbg
-Section: debug
-Priority: extra
-Architecture: @ARCH_REVLISTOF_MPICH@
-Depends: libtachyon-mpich- at LT_CURRENT@ (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: @SYNOPSIS_LIBRARY@ - debug package - MPICH flavour
- ##DescriptionMainPart##
- .
- This package provides the debugging symbols for the libraries from
- the libtachyon-mpich- at LT_CURRENT@-dev package.
-
Package: libtachyon-dev-common
Section: libdevel
Architecture: all
@@ -235,7 +183,7 @@ Package: tachyon-bin-nox
Provides: tachyon-bin
Breaks: tachyon (<< 0.99~b6)
Architecture: any
-Depends: libtachyon-mt- at LT_CURRENT@ (= ${binary:Version}) | libtachyon, ${shlibs:Depends}, ${misc:Depends}
+Depends: libtachyon-mt- at LT_CURRENT@ (= ${binary:Version}) | libtachyon, ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: foreign
Description: @SYNOPSIS_TOOLS@ - with no X support
##DescriptionMainPart##
@@ -243,7 +191,6 @@ Description: @SYNOPSIS_TOOLS@ - with no X support
This package provides a simple scene file parser front-end built upon
tachyon but without X support.
-
Package: tachyon-bin-ogl
Provides: tachyon-bin
Breaks: tachyon (<< 0.99~b6)
@@ -260,7 +207,11 @@ Package: tachyon-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: libtachyon-dev, tachyon-bin
+Enhances:
+ libtachyon-dev, tachyon-bin,
+ libtachyon-serial- at LT_CURRENT@, libtachyon-mt- at LT_CURRENT@,
+ libtachyon-openmpi- at LT_CURRENT@, libtachyon-mpich- at LT_CURRENT@
+Suggests: pdf-viewer
Multi-Arch: foreign
Description: @SYNOPSIS_MANUAL@ - reference manual
##DescriptionMainPart##
diff --git a/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in b/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in
new file mode 100644
index 0000000..d74442e
--- /dev/null
+++ b/debian/templates/libtachyon-LIBFLAVOUR-dev.maintscript.in
@@ -0,0 +1 @@
+dir_to_symlink /usr/share/doc/libtachyon- at LIBFLAVOUR@- at LT_CURRENT@-dev /usr/share/doc/libtachyon-dev-common 0.99~b6+dsx-5~
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tachyon.git
More information about the debian-science-commits
mailing list