--- radiance-4R0+20100729.orig/debian/radiance.docs +++ radiance-4R0+20100729/debian/radiance.docs @@ -0,0 +1 @@ +README --- radiance-4R0+20100729.orig/debian/radiance.install +++ radiance-4R0+20100729/debian/radiance.install @@ -0,0 +1 @@ +debian/lintian-overrides/radiance usr/share/lintian/overrides --- radiance-4R0+20100729.orig/debian/radiance-doc.install +++ radiance-4R0+20100729/debian/radiance-doc.install @@ -0,0 +1,8 @@ +doc/pdf/*.pdf usr/share/doc/radiance +doc/notes usr/share/doc/radiance +doc/digest usr/share/doc/radiance +doc/ray.html usr/share/doc/radiance +doc/ray.1 usr/share/doc/radiance +doc/materials.1 usr/share/doc/radiance +src/cv/mgflib/mgfdoc.pdf usr/share/doc/radiance +obj/*.tar /usr/share/doc/radiance/examples --- radiance-4R0+20100729.orig/debian/changelog +++ radiance-4R0+20100729/debian/changelog @@ -0,0 +1,278 @@ +radiance (4R0+20100729-1) unstable; urgency=low + + * [8f56f9d6] CVS HEAD (2010-07-29) + + -- Bernd Zeimetz Sun, 01 Aug 2010 22:20:11 +0200 + +radiance (4R0+20100620-1) unstable; urgency=low + + * [911667a6] CVS HEAD (2010-06-20) + + -- Bernd Zeimetz Tue, 22 Jun 2010 23:17:28 +0200 + +radiance (4R0+20100331-1) unstable; urgency=low + + * [8b28e531] Add missing ${misc:Depends} to two packages. + * [04499cf8] Use source format version 1.0. + * [7d240d3b] CVS HEAD (2010-03-31) + * [6a5560a3] Updating patches for the new uptsream version. + + -- Bernd Zeimetz Wed, 31 Mar 2010 21:54:59 +0200 + +radiance (3R9+20100109-1) unstable; urgency=low + + * CVS HEAD (2010-01-09) + + -- Bernd Zeimetz Wed, 20 Jan 2010 13:08:54 +0100 + +radiance (3R9+20091217-1) experimental; urgency=low + + * [b2fb5989] CVS HEAD (2009-12-17) + * [3e118c0e] Bumping Standards-Version to 3.8.3. No changes needed. + + -- Bernd Zeimetz Sat, 19 Dec 2009 14:28:35 +0100 + +radiance (3R9+20091104-1) experimental; urgency=low + + * Upload to experimental to give the new libtiff a try. + * [2e09d681] CVS HEAD (2009-11-04) + * [1e5f55bf] Use libtiff-dev if available. + * [c928580c] Require pristine tar for gbp. + + -- Bernd Zeimetz Thu, 05 Nov 2009 18:27:59 +0100 + +radiance (3R9+20090811-1) unstable; urgency=low + + * [af40ec9f] CVS HEAD (2009-08-11) + + -- Bernd Zeimetz Wed, 26 Aug 2009 10:39:55 +0200 + +radiance (3R9+20090725-1) unstable; urgency=low + + * [fe2c8411] Dropping meta-Rmakefile-missing-deps patch. + * [533cbb1c] CVS HEAD (2009-07-24) + * [c332c2c1] Updating Debian patches for lates CVS HEAD. + * [4730253b] Adding git-buildpackage config. + + -- Bernd Zeimetz Sat, 25 Jul 2009 22:42:04 +0200 + +radiance (3R9+20090601-1) unstable; urgency=low + + * [7d8242e2] Enable -funroll-loops on arm for gcc >= 4.3.1-1 (Closes: + #481880) + * [49343fec] CVS HEAD (2009-06-01) + * [1b922e1f] Install cal files from src/cal/cal - thanks to Terrance + Mc Minn + + -- Bernd Zeimetz Thu, 04 Jun 2009 12:00:23 +0200 + +radiance (3R9+20090530-1) unstable; urgency=low + + * Updating to CVS HEAD from 2009-05-30. + * Updating debian/patches/use-system-libtiff to apply again. + * Updating copyright of the Debian packagaging. + * Bumping Standards-Version to 3.8.1, no changes needed. + + -- Bernd Zeimetz Sun, 31 May 2009 02:14:11 +0200 + +radiance (3R9+20090312-1) unstable; urgency=low + + * Updating to CVS HEAD from 2009-03-12. + + -- Bernd Zeimetz Fri, 13 Mar 2009 13:12:34 +0100 + +radiance (3R9+20090211-1) unstable; urgency=low + + * Updating to CVS HEAD from 2009-02-11. + * Removed all libtiff related embedded code copies from the upstream + branch, including header files. Also removed libtiff related + patches from debian/patches and settings from debian/rules. + * Adding debian/patches/use-system-libtiff to patch the necessary + Rmakefiles to use the system's libtiff. Also refreshing all other + patches. + * Adding debian/README.source as required by policy. The content of + debian/README.Debian-source was updated and included into + the new file and the old one dropped. + * debian/control: Bumping Standards-Version to 3.8.0. + + -- Bernd Zeimetz Sat, 21 Feb 2009 15:29:24 +0100 + +radiance (3R9+20080530-4) unstable; urgency=high + + * debian/patches: + - Adding 'using_mktemp_security_fix' patch to avoid a possible + symlink attack. Now scripts are using mktemp(1) to create files in + /tmp. Thanks to Dmitry E. Oboukhov for the report (Closes: #496423). + + -- Bernd Zeimetz Thu, 28 Aug 2008 00:33:52 +0200 + +radiance (3R9+20080530-3) unstable; urgency=low + + * debian/rules: + - Disabling -funroll-loops not only for arm, but also for armel, + (see #476460 for details). + + -- Bernd Zeimetz Sat, 31 May 2008 18:34:35 +0200 + +radiance (3R9+20080530-2) unstable; urgency=low + + * debian/rules: + - Although upstream "fixed" tifftypes.h, it still results in + build failures on several architectures. Using /usr/include/tiff.h + instead again. + + -- Bernd Zeimetz Sat, 31 May 2008 14:49:07 +0200 + +radiance (3R9+20080530-1) unstable; urgency=low + + * Updating to CVS HEAD from 2008-05-30. + Including a fix for an implicit declaration and a few minor bugs. + * debian/patches: + - Due to upstream incorporating suggestions and patches from Debian, the + following patches could be dropped completely: + + 0004-Update-gen-Rmakefile-to-use-the-systemwide-libtiff-i.patch + + 0005-Update-cv-Rmakefile-to-use-the-systemwide-libtiff-if.patch + + 0006-Update-hd-Rmakefile-to-use-the-systemwide-libtiff-if.patch + + 0007-Update-ot-Rmakefile-to-use-the-systemwide-libtiff-if.patch + + 0008-Update-rt-Rmakefile-to-use-the-systemwide-libtiff-if.patch + + 0010-Update-util-Rmakefile-to-use-the-systemwide-libtiff.patch + + no-hardlinks + - 0009*.patch and 0011*.patch were updated and renamed to + meta-Rmakefile-missing-deps / cal-Rmakefile-missing-deps + * debian/rules: + - Updating according to the changes in the patches. + + -- Bernd Zeimetz Sat, 31 May 2008 00:52:50 +0200 + +radiance (3R9-3) unstable; urgency=low + + * debian/rules: + - disabling -funroll-loops on arm to avoid a FTBFS due to a + segfault in gcc 4.3 (see #476460 for details). + + -- Bernd Zeimetz Mon, 19 May 2008 09:44:41 +0200 + +radiance (3R9-2) unstable; urgency=low + + * debian/rules: + - Fixing FTBFS on several platforms where sudo is used instead of + fakeroot. Reason here was quilt which does not clean up created + directories. + + -- Bernd Zeimetz Sat, 17 May 2008 22:57:23 +0200 + +radiance (3R9-1) unstable; urgency=low + + * New upstream version. + + Does not include files without sources anymore, dropping the dfsg + from the version number. + * debian/rules: + - Don't use -ffast-math as optimization anymore as it can lead to "zero + ray direction in localhit" errors. See <48066BAE.4050302@gmx.net> on the + radiance-general list for details. + - Use ln -s as value for LN while building, debian/patches/no-hardlinks + allows us to override the setting for LN now. + - Use quilt instead of dpatch now. + - Creating a better src/rt/Version.c while building now, cleaning it up + properly after the build. + * debian/control: + - Adding Vcs-Browser and Vcs-Git fields. + - Replacing dpatch build-dep by quilt. + * debian/patches: + - Moving from dpatch to quilt. + - Completely refactoring the patches which removed the support for the + included libtiff. Now they allow to build against the included version + (which is not shipped in the Debian package) or against a system-wide + installation of libtiff (which is what we want). + - Refreshing patches to fit to the new upstream version. + - Deleting ies2rad-ftbfs-fix, not needed anymore. + - Deleting rmakefile-clean-fix - Version.c is created and removed by + debian/rules now. + - Adding new patch to fix several syntax bugs in manpages. + * debian/README.Debian-source + - Updating file to introduce into the usage of the git repository and to + explain how to retrieve the original source. + + -- Bernd Zeimetz Sat, 17 May 2008 18:20:06 +0200 + +radiance (3R8+20080210.dfsg-2) unstable; urgency=low + + * debian/patches: + - Adding ies2rad-ftbfs-fix.dpatch to fix a FTBFS on some architectures due + to a missing -lm. + + -- Bernd Zeimetz Sun, 10 Feb 2008 23:20:20 +0100 + +radiance (3R8+20080210.dfsg-1) unstable; urgency=low + + * Update to latest HEAD revision. + * debian/patches: + - Removing mgflib-make-params.dpatch, integrated upstream. + - libtiff-remove-in-other-dirs.dpatch updated. + * debian/control: + - Bumping Standards-Version to 3.7.3, no changes needed. + - Moving to Priority: extra - Lightning simulation is not public enough to + have the package in optional. + - Updating my email address. + + -- Bernd Zeimetz Sun, 10 Feb 2008 20:13:29 +0100 + +radiance (3R8+20071122.dfsg-2) unstable; urgency=low + + * debian/rules: + - Fixing a bug where the package FTBFS on systems where /bin/sh is + linked to /bin/dash. Thanks to Luca Falavigna (Closes: #453810). + * debian/control: + - Adding libxext-dev to Build-Depends, thanks to Luca Falavigna + (Closes: #453811). In Debian libx11-dev depends on libxext-dev, so the + missing dependency did not result in FTBFS. + + -- Bernd Zeimetz Sat, 01 Dec 2007 22:24:43 +0100 + +radiance (3R8+20071122.dfsg-1) unstable; urgency=low + + * Building 3R8 with HEAD from 20071122. Also building and installing + 3ds2mgf + 3ds2mgf.1. + * Moving DEVDIR to /usr/lib/radiance/dev, so we can use /usr/lib/radiance + for compatibility links to support old renderings. Adding links for + genrbox and rvu, which were formerly know as genbox and rview. + * Cleaning up and splitting the patch which renames genbox to genrbox. + * Upstream ships the source of doc/pdf/raduser1_6.pdf now. Keeping the pdf + in the source while repackaging and shipping it with radiance-doc. + * Dropping parts from the patches which were integrated upstream. + * Building the ogl device files for rholo now, this should speed up rholo + pretty much. + * Adding 'pbilat' to radiance-experttools.1 - new bilateral filter. + + -- Bernd Zeimetz Fri, 23 Nov 2007 00:27:10 +0100 + +radiance (3R8+20070924.dfsg-2) unstable; urgency=low + + * Removing DS_Store files from the doc/ps directory as they're cruft + from other operating systems. + * Installing trad, thanks to Axel Jacobs for the hint + - Removing debian/patches/do-not-install-trad.dpatch + - Updating debian/rules to handle trad properly + - Adding tk8.4 dependencies in debian/control + * debian/radiance-doc.install: + - Install ps files from doc/ps only, not weird DS_Store files + * Renaming the genbox utility as the name is used by gromacs allready + (Closes: #446726). The new name is genrbox. + - Adding debian/patches/genbox-rename.dpatch to fix libraries and + documentataion. + - Renaming the manpage in debian/rules + * debian/control: + - Adding a versioned conflict to the rcalc package to make backporters' + life more easy. It shipped 'rcalc' in /usr/bin, too. + * debian/{radiance.NEWS,README}.Debian: + - Documenting the new name of 'genbox'. + + -- Bernd Zeimetz Sun, 21 Oct 2007 21:42:40 +0200 + +radiance (3R8+20070924.dfsg-1) unstable; urgency=low + + * Initial release (Closes: #431974) + Thanks to Gregory J. Ward for all the help! + + -- Bernd Zeimetz Tue, 14 Aug 2007 15:06:09 +0200 + --- radiance-4R0+20100729.orig/debian/radiance-materials.install +++ radiance-4R0+20100729/debian/radiance-materials.install @@ -0,0 +1,5 @@ +src/*/*/*.cal usr/share/radiance +src/*/*.cal usr/share/radiance +src/*/*.tab usr/share/radiance +src/*/*.hex usr/share/radiance +lib/* usr/share/radiance --- radiance-4R0+20100729.orig/debian/radiance.links +++ radiance-4R0+20100729/debian/radiance.links @@ -0,0 +1,21 @@ +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/debugcal.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/genambpos.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/genrhgrid.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/glaze.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/mgf2inv.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/mgfilt.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/nff2rad.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/objpict.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/optics2rad.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/pbilat.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/pcwarp.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/pdelta.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/pgblur.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/plot4.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/ra_hexbit.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/ra_pfm.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/rlux.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/vinfo.1.gz +usr/share/man/man1/radiance-experttools.1.gz usr/share/man/man1/xyzimage.1.gz +usr/bin/genrbox usr/lib/radiance/genbox +usr/bin/rvu usr/lib/radiance/rview --- radiance-4R0+20100729.orig/debian/rules +++ radiance-4R0+20100729/debian/rules @@ -0,0 +1,207 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +#we use quilt to handle our patches +include /usr/share/quilt/quilt.make + + + +#build options +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + OPT = -O0 + OPTSSE3 = -O0 +else + #although we can use -ffast-math as radiance doesn't rely on exact + #implementation of IEEE or ISO rules/specifications for math functions, + #I've disabled it to avoid "zero ray direction in localhit" errors. + #see <48066BAE.4050302@gmx.net> on the radiance-general list + OPT = -O3 + OPTSSE3 = -O3 -funroll-loops -msse3 -mfpmath=sse + +#-funroll-loops is broken on older gcc versions on arm (see #476460). +ifeq (0,$(shell dpkg --compare-versions $(shell gcc --version| grep Debian | sed 's,.*Debian ,,;s,. [0-9].*,,') ge 4.3.1-1 && echo 0)) + OPT += -funroll-loops +else +ifneq (arm,$(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)) + OPT += -funroll-loops +endif +endif +endif + +MACH = -Wall -g -Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO +COMPAT = erf.o +DEVDIR = /usr/lib/radiance/dev +LIBDIR = /usr/share/radiance +INSTDIR = /usr/bin +SPECIAL = ogl + +#full make overrides +MAKEOVERRIDES = OPT="$$opt" MACH="$(MACH)" ARCH="$(DEB_HOST_ARCH)" \ + COMPAT="$(COMPAT)" SPECIAL="$(SPECIAL)" ESUFFIX="" LN="ln -s" \ + INSTDIR="$$instdir" LIBDIR="$$libdir" DEVDIR="$$devdir" + +#sourcedirs in the right order, taken from makeall +SRCDIRS = common rt meta cv gen ot px hd util cal + +SRCDIRS-SSE3 = common rt + +DEB_VERSION := $(shell dpkg-parsechangelog | grep '^Version' | cut -d ' ' -f 2) + +RMAKE = set -e ; set -x ;\ + [ "$$opt" ] || opt="$(OPT)" ;\ + [ "$$instdir" ] || instdir="$$destdir$(INSTDIR)" ;\ + [ "$$libdir" ] || libdir="$$destdir$(LIBDIR)" ;\ + [ "$$devdir" ] || devdir="$$destdir$(DEVDIR)" ;\ + [ "$$srcdirs" ] || srcdirs="$(SRCDIRS)" ;\ + for sdir in $$srcdirs; do \ + cd src/$$sdir ;\ + make -f Rmakefile $$rmakeopts $(MAKEOVERRIDES);\ + cd $(CURDIR) ;\ + done + +debian/%.1: debian/%.sgml + docbook-to-man $< > $@ + +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: $(QUILT_STAMPFN) debian/radiance-experttools.1 + + #file permissions are rather weird, fixing this + find src -type f -print0 | xargs -0 chmod 644 + + mkdir src/lib + + echo 'char VersionID[]="RADIANCE $(DEB_VERSION) (Debian package)";' > src/rt/Version.c + + + rmakeopts="all"; $(RMAKE) + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: + + cd obj; for dir in *; do tar cf $$dir.tar $$dir; done; cd .. + touch $@ + +build-sse3: + + rmakeopts="clean"; $(RMAKE) + rmakeopts="all"; \ + srcdirs="$(SRCDIRS-SSE3)"; \ + opt="$(OPTSSE3)"; \ + $(RMAKE) + +clean: clean-patched unpatch + +clean-patched: $(QUILT_STAMPFN) + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp + rmakeopts="clean"; $(RMAKE) + rm -rf src/lib + rm -f obj/*.tar + rm -f debian/radiance-experttools.1 + rm -f src/rt/Version.c + + dh_clean + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -s + dh_installdirs -s + rmakeopts="install"; \ + destdir="$(CURDIR)/debian/radiance"; \ + $(RMAKE) + #fix directory in trad + sed -i 's,$(CURDIR)/debian/radiance,,g' $(CURDIR)/debian/radiance/usr/bin/trad + #rview was the former name of rvu and renamed as vim provides /usr/bin/rview + #so we remove the compatibility link + rm -f $(CURDIR)/debian/radiance/usr/bin/rview + #a bit hackish, but more easy than patching a lot of Rmakefiles. + #our dh_install will install the files later into the proper package + find $(CURDIR)/debian/radiance/usr/share -mindepth 1 -maxdepth 1 -name radiance -o -print0 | \ + xargs -0 rm -rf + find $(CURDIR)/debian/radiance/usr/share/radiance -mindepth 1 -maxdepth 1 -name tcl -o -print0 | \ + xargs -0 rm -rf + dh_install -s -Nradiance-sse3 + +install-sse3: + dh_testdir + dh_testroot + rmakeopts="install"; \ + opt="$(OPTSSE3)"; \ + srcdirs="$(SRCDIRS-SSE3)"; \ + destdir="$(CURDIR)/debian/radiance-sse3"; \ + $(RMAKE) + rm -rf $(CURDIR)/debian/radiance-sse3/usr/lib + rm -rf $(CURDIR)/debian/radiance-sse3/usr/share + rm -f $(CURDIR)/debian/radiance-sse3/usr/bin/rview + rm -f $(CURDIR)/debian/radiance-sse3/usr/bin/lookamb + dh_install -pradiance-sse3 + +binary-indep: build-indep install-indep + dh_testdir + dh_testroot + dh_installchangelogs -i + dh_installdocs -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + + +ifneq (i386,$(DEB_HOST_ARCH)) +binary-arch: build-arch install-arch +else +binary-arch: build-arch install-arch build-sse3 install-sse3 +endif + dh_testdir + dh_testroot + dh_installchangelogs -s + dh_installdocs -s + dh_installman -s + #genbox was renamed, following this change for the manpage, too. + mv $(CURDIR)/debian/radiance/usr/share/man/man1/genbox.1 \ + $(CURDIR)/debian/radiance/usr/share/man/man1/genrbox.1 + dh_link -s + dh_strip -s + dh_compress -s + dh_fixperms -s + dh_makeshlibs -s + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + + +binary: binary-arch binary-indep + +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-indep install-arch unpatch get-orig-source + + +############################################################################## +# +# targets which are not needed to build the package: + +SOURCE-VERSION = `dpkg-parsechangelog | \ + grep ^Version | \ + sed 's,.* ,,;s,+.*,,'`+`date '+%Y%m%d'`.dfsg + +get-orig-source: + echo "Please see debian/README.Debian-source for details" --- radiance-4R0+20100729.orig/debian/3ds2mgf.1 +++ radiance-4R0+20100729/debian/3ds2mgf.1 @@ -0,0 +1,39 @@ +.TH 3DS2MGF "1" "November 2007" "3ds2mgf 2.0" "RADIANCE" +.SH NAME +3ds2mgf \- Autodesk 3D Studio to Raytracer file Translator +.SH SYNOPSIS +.B 3ds2mgf +\fIinputfile\fR[\fI.3ds\fR] [\fIoutputfile\fR] [\fIoptions\fR] +.SH DESCRIPTION +.PP +\fB\-snnn\fR \- Smooth triangles with angles < nnn +.HP +\fB\-l\fR \- Specifies native material library +.HP +\fB\-a\fR \- Use animation information in specified file +.HP +\fB\-fnnn\fR \- Generate frame nnn of animation +.HP +\fB\-x\fR \- Exclude this object from conversion +.HP +\fB\-b\fR \- Convert this object as a box +.HP ++i, \fB\-i\fR \- Turn internal bounding on or off +.HP ++v, \fB\-v\fR \- Turn verbose status messages on or off +.HP +\fB\-op\fR \- Output to POV\-Ray 2.0 format +.HP +\fB\-op1\fR \- Output to POV\-Ray 1.0 format +.HP +\fB\-ov\fR \- Output to Vivid format +.HP +\fB\-ol\fR \- Output to poLyray format +.HP +\fB\-om\fR \- Output to MGF +.HP +\fB\-or\fR \- Output to RAW triangle format +.PP +ex. /usr/bin/3ds2mgf birdshow +v \fB\-lmaterials\fR.inc +.SH "SEE ALSO" +mgf2inv(1), mgf2meta(1), mgf2rad(1), mgfilt(1) --- radiance-4R0+20100729.orig/debian/control +++ radiance-4R0+20100729/debian/control @@ -0,0 +1,65 @@ +Source: radiance +Section: graphics +Priority: extra +Maintainer: Bernd Zeimetz +Build-Depends: debhelper (>= 5), libtiff-dev | libtiff4-dev, libx11-dev, libglu1-mesa-dev, libxext-dev, quilt, tcsh | c-shell, docbook-to-man, ed, tk8.4 +Standards-Version: 3.8.3 +Homepage: http://radsite.lbl.gov/radiance +Vcs-Browser: http://git.recluse.de/?p=debian/pkg-radiance.git;a=summary +Vcs-Git: git://git.recluse.de/debian/pkg-radiance.git + +Package: radiance +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, tcsh | c-shell, tk8.4 +Recommends: radiance-materials +Suggests: radiance-doc +Conflicts: rcalc (<= 0.5.0-1.1) +Description: Lighting Simulation and Rendering System + Radiance is intended to aid lighting designers and architects by + predicting the light levels and appearance of a space prior to + construction. The package includes programs for modeling and translating + scene geometry, luminaire data and material properties, all of which are + needed as input to the simulation. The lighting simulation itself uses + ray tracing techniques to compute radiance values (ie. the quantity of + light passing through a specific point in a specific direction), which + are typically arranged to form a photographic quality image. The + resulting image may be analyzed, displayed and manipulated within the + package, and converted to other popular image file formats for export to + other packages, facilitating the production of hard copy output. + +Package: radiance-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: radiance, radiance-materials +Description: Lighting Simulation and Rendering System - Documentation + Radiance is intended to aid lighting designers and architects by + predicting the light levels and appearance of a space prior to + construction. + . + This package contains the documentation and examples for radiance. + +Package: radiance-sse3 +Architecture: i386 +Depends: ${shlibs:Depends}, ${misc:Depends}, radiance (= ${binary:Version}) +Description: Lighting Simulation and Rendering System - SSE3 optimizations + Radiance is intended to aid lighting designers and architects by + predicting the light levels and appearance of a space prior to + construction. + . + This package contains SSE3-optimized versions of the renderers. To be able + to use them your processor needs to support the SSE3 instruction set. + Using optimized binaries speeds up rendering by 5-15%. + +Package: radiance-materials +Architecture: all +Depends: ${misc:Depends} +Description: Lighting Simulation and Rendering System - Materials + Radiance is intended to aid lighting designers and architects by + predicting the light levels and appearance of a space prior to + construction. + . + This package contains common auxiliary files used by Radiance, including + procedural patterns, textures and coordinate mappings, font descriptions, + compiled scene descriptions for use in instances, material definitions, + images for patterns and other examples. --- radiance-4R0+20100729.orig/debian/radiance-experttools.sgml +++ radiance-4R0+20100729/debian/radiance-experttools.sgml @@ -0,0 +1,212 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + BERND"> + ZEIMETZ"> + + Sat Sep 8 2007"> + + 1"> + <bernd@bzed.de>"> + + RADIANCE-EXPERTTOOLS"> + Debian"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2007 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + radiance-experttools + + Specialty programs of the Radiance package, used by experts + + + DESCRIPTION + + This manual page documents briefly the + debugcal, genambpos, genrhgrid, glaze, mgf2inv, mgfilt, nff2rad, objpict, optics2rad, pcwarp, pdelta, pgblur, plot4, ra_hexbit, ra_pfm, rlux, vinfo and xyzimage commands. + + These specialty programs of the Radiance package are commonly only used by experts, therefore the Radiance distribution does not contain full manpages for them. + + + debugcal + + debugcal is a script to debug cal files for Radiance + Takes octree and rcalc options as arguments. One of the rcalc options should be -f calfile. Note that the real arguments A1, A2, etc must also be given. Input is a ray origin and direction, such as that produced by ximage. + + + + + genambpos + + genambpos is a script which puts coloured markers (spheres) at points where hemispherical sampling was initiated. The locations and levels are taken from the binary ambient file. + + + + genrhgrid + + genrhgrid is a program to generate Radiance section grid representations + + + + glaze + + Complex glazing model (goes with glaze1.cal and glaze2.cal) + + + + mgf2inv + + mgf2inv is a translator from MGF to Inventor (or VRML) format + + + + mgfilt + + mgfilt is a filter for MGF + + + + nff2rad + + nff2rad converts Neutral File Format input to Radiance scene descriptions. + + + + objpict + + objpict makes a nice multi-view picture of an object. Command line arguments contain materials and object files. + + + + optics2rad + + optics2rad converts Optics 5 output to correct Radiance input. + + + + pbilat + + Bilateral Filter. + + + + pcwarp + + Intended as more general substitute for macbetcal, but never quite worked. + + + + pdelta + + pdelta computes 1976 CIE Lab deltaE* between two Radiance pictures. + + + + pgblur + + pgblur applies Gaussian blur without resizing the image. More efficient than straight pfilt for large blurs. + + + + plot4 + + plot4 is a program to put four metafile pages onto one. + + + + ra_hexbit + + ra_hexbit is a program to generate bitmap files for use with hexbit4x1.fnt. + + + + ra_pfm + + ra_pfm is a program to convert to/from Poskanzer Float Map image format using pvalue. + + + + rlux + + rlux computes illuminance from ray origin and direction. + + + vinfo + + vinfo is a wrapper around vim to edit information header in Radiance files. + + + + xyzimage + + xyzimage is a program to display one or more CIE XYZE pictures using ximage. + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the Radiance Software License, Version 1.0. + + + + + + + + --- radiance-4R0+20100729.orig/debian/radiance-sse3.preinst +++ radiance-4R0+20100729/debian/radiance-sse3.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ install = "$1" ]; then + for bin in rtrace rpict rvu; do + dpkg-divert --package radiance-sse3 --add --rename \ + --divert /usr/bin/$bin.noopt /usr/bin/$bin + done +fi + +#DEBHELPER# + --- radiance-4R0+20100729.orig/debian/radiance.manpages +++ radiance-4R0+20100729/debian/radiance.manpages @@ -0,0 +1,2 @@ +doc/man/man*/* +debian/*.1 --- radiance-4R0+20100729.orig/debian/copyright +++ radiance-4R0+20100729/debian/copyright @@ -0,0 +1,144 @@ +This package was debianized by Bernd Zeimetz on +Tue, 14 Aug 2007 15:06:09 +0200. + +It was downloaded from http://www.radiance-online.org/software/ + +Upstream Author: + + Gregory J. Ward + +Copyright: + + Copyright (c) 1990 - 2006 The Regents of the University of California, + through Lawrence Berkeley National Laboratory. All rights reserved. + +License: + + The Radiance Software License, Version 1.0 + + Copyright (c) 1990 - 2002 The Regents of the University of California, + through Lawrence Berkeley National Laboratory. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes Radiance software + (http://radsite.lbl.gov/) + developed by the Lawrence Berkeley National Laboratory + (http://www.lbl.gov/)." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + + 4. The names "Radiance," "Lawrence Berkeley National Laboratory" + and "The Regents of the University of California" must + not be used to endorse or promote products derived from this + software without prior written permission. For written + permission, please contact radiance@radsite.lbl.gov. + + 5. Products derived from this software may not be called "Radiance", + nor may "Radiance" appear in their name, without prior written + permission of Lawrence Berkeley National Laboratory. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR + ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + ==================================================================== + + This software consists of voluntary contributions made by many + individuals on behalf of Lawrence Berkeley National Laboratory. For more + information on Lawrence Berkeley National Laboratory, please see + . + + + +The Debian packaging is +Copyright (C) 2007-2009, Bernd Zeimetz +and is licensed under the MIT License. + + +Additional copyrights/licenses: + +* src/px/neuclrtab.c: + + As mentioned in neuclrtab.c, it contains a part of code which was adapted + and modified from the original NEUQUANT.C, which is available at + http://members.ozemail.com.au/~dekker/NEUQUANT.HTML and contains the + following copyright/license: + + NeuQuant Neural-Net Quantization Algorithm + ------------------------------------------ + + Copyright (c) 1994 Anthony Dekker + + NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. + See "Kohonen neural networks for optimal colour quantization" + in "Network: Computation in Neural Systems" Vol. 5 (1994) pp 351-367. + for a discussion of the algorithm. + See also http://members.ozemail.com.au/~dekker/NEUQUANT.HTML + + Any party obtaining a copy of these files from the author, directly or + indirectly, is granted, free of charge, a full and unrestricted irrevocable, + world-wide, paid up, royalty-free, nonexclusive right and license to deal + in this software and documentation files (the "Software"), including without + limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons who receive + copies from any such party to do so, with the only requirement being + that this copyright notice remain intact. + + +* src/cv/mgflib/* (except 3ds2mgf; see src/cv/mgflib/readme.txt): + + This library was put in public domain and is offered free + of charge to all those who wish to use it for any purpose. + We take no responsibility for its use, misuse, correctess, + or suitability. + + +* src/gen/ezxml.{c,h}: + + Copyright 2004-2006 Aaron Voisine + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +* lib/helvet.fnt: + + A Helvetica-like font put into the public domain in the '70s + --- radiance-4R0+20100729.orig/debian/README.source +++ radiance-4R0+20100729/debian/README.source @@ -0,0 +1,31 @@ +radiance (3R9+20090211-1) unstable; urgency=low + + * The radiance packaging uses quilt to manage patches + at build time. Please install the package 'quilt' and see + /usr/share/doc/quilt/README.source + for details. + + * Git access is available via + Vcs-Browser: http://git.recluse.de/?p=debian/pkg-radiance.git;a=summary + Vcs-Git: git://git.recluse.de/debian/pkg-radiance.git + + The repository contains 3 branches: + upstream-cvs: Source code as published by Greg Ward via CVS + upstream: upstream source, but prepared for the Debian packaging + (For details see below) + master: Debian packaging branch. + + Updates on the upstream-cvs source are added by a cronjob every + night. They'll be pulled manually into the upstream branch, where + they'll be cleaned up from extra/unneeded files. From + there the changes are pulled into the master branch. + + Modifications on source code only happen by quilt patchsets in the master + branch. + + The Debian source of radiance was repackaged to save space only, + there's no non-free material included anymore. Mainly the embedded copy + of libtiff was removed, together with some cruft from CVS and OSX. + + -- Bernd Zeimetz Sat, 21 Feb 2009 15:24:40 +0100 + --- radiance-4R0+20100729.orig/debian/compat +++ radiance-4R0+20100729/debian/compat @@ -0,0 +1 @@ +5 --- radiance-4R0+20100729.orig/debian/gbp.conf +++ radiance-4R0+20100729/debian/gbp.conf @@ -0,0 +1,54 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default build command: +#builder = debuild -i\.git/ -I.git +# the default clean command: +cleaner = fakeroot debian/rules clean + +# the default branch for upstream sources: +upstream-branch = upstream +# the default branch for the debian patch: +debian-branch = master +# the default tag formats used: +upstream-tag = upstream/%(version)s +debian-tag=%(version)s +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xC93BFF79 +# push to a remote repository after a successful tag: +#posttag = git-push git.example.com +# use this for more svn-buildpackage like behaviour: +#export-dir = ../build-area/ +#tarball-dir = ../tarballs/ +#ignore-new = True + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean +#filter = .svn + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream +#filter = [ 'CVS', '.cvsignore' ] + +# Options only affecting git-dch +[git-dch] +git-log = --no-merges +#snapshot-number = snapshot + 1 +# include 0 digits of the commit id in the changelog enty +id-length = 8 +# don't include information from meta tags +meta = True +# what tags to look for to generate bug-closing changelog entries +meta-closes = Closes|LP + --- radiance-4R0+20100729.orig/debian/radiance-doc.links +++ radiance-4R0+20100729/debian/radiance-doc.links @@ -0,0 +1 @@ +/usr/share/doc/radiance /usr/share/doc/radiance-doc/docs --- radiance-4R0+20100729.orig/debian/radiance.NEWS +++ radiance-4R0+20100729/debian/radiance.NEWS @@ -0,0 +1,7 @@ +radiance (3R8+20070924.dfsg-2) unstable; urgency=low + + * To avoid a name clash with the 'gromacs' package, the util 'genbox' was + renamed to 'genrbox'. Please update your scripts or set an appropriate + symlink. + + -- Bernd Zeimetz Sat, 20 Oct 2007 00:32:38 +0200 --- radiance-4R0+20100729.orig/debian/README.Debian +++ radiance-4R0+20100729/debian/README.Debian @@ -0,0 +1,36 @@ +Radiance for Debian +------------------- + +A few hints to use Debian's distribution of radiance: + + * If you're interested in working with radiance, take a look at the + example chaptors of the radiance book, which are available at + http://radsite.lbl.gov/radiance/book/ + Although radiance is very well documented in form of manpages, + I can really recommend this book if you plan dig deeper into the + capabilities of Radiance + + * Renamed programs: + * rview -> rvu: This happened some long time ago as rview is provided + by vim. + * genbox -> genrbox: In Debian genbox existed, so it had to be renamed. + In you do not want to use the new names the radiance package provides + compatibilit links in /usr/lib/radiance. To use them, you have to add + the directory to the PATH variable in your environment, for example by + adding + PATH=$PATH:/usr/lib/radiance + export PATH + to your shell's rc file, usually ~/.bashrc. + + * The radiance-doc package contains some example scenes in + /usr/share/doc/radiance/examples + To view them extract one of the tar.gz files and run 'make` in the + extracted diretory. the "cabin" example also contains settings to + demonstrate the rholo tool, to give this a try run 'make nholo` + (for a night scene) or 'make sholo` (for a summer scene). + + * On Debian systems, /usr/share/radiance will be used as default for + $RAYPATH to be conform with the FHS. But I guess most people will have + their own $RAYPATH anyway. + + -- Bernd Zeimetz Thu, 22 Nov 2007 23:46:06 +0100 --- radiance-4R0+20100729.orig/debian/radiance-sse3.postrm +++ radiance-4R0+20100729/debian/radiance-sse3.postrm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ remove = "$1" ]; then + for bin in rtrace rpict rvu; do + dpkg-divert --package radiance-sse3 --remove --rename \ + --divert /usr/bin/$bin.noopt /usr/bin/$bin + done +fi + +#DEBHELPER# + --- radiance-4R0+20100729.orig/debian/radiance-sse3.dirs +++ radiance-4R0+20100729/debian/radiance-sse3.dirs @@ -0,0 +1,2 @@ +usr/share/radiance/ray +usr/bin --- radiance-4R0+20100729.orig/debian/radiance.dirs +++ radiance-4R0+20100729/debian/radiance.dirs @@ -0,0 +1,3 @@ +usr/lib/radiance/dev +usr/share/radiance/ray +usr/bin --- radiance-4R0+20100729.orig/debian/radiance-sse3.install +++ radiance-4R0+20100729/debian/radiance-sse3.install @@ -0,0 +1 @@ +debian/lintian-overrides/radiance-sse3 usr/share/lintian/overrides --- radiance-4R0+20100729.orig/debian/lintian-overrides/radiance +++ radiance-4R0+20100729/debian/lintian-overrides/radiance @@ -0,0 +1,27 @@ +#csh is not as bad as policy thinks +radiance: csh-considered-harmful ./usr/bin/compamb +radiance: csh-considered-harmful ./usr/bin/dayfact +radiance: csh-considered-harmful ./usr/bin/debugcal +radiance: csh-considered-harmful ./usr/bin/falsecolor +radiance: csh-considered-harmful ./usr/bin/fieldcomb +radiance: csh-considered-harmful ./usr/bin/genambpos +radiance: csh-considered-harmful ./usr/bin/glare +radiance: csh-considered-harmful ./usr/bin/glaze +radiance: csh-considered-harmful ./usr/bin/normpat +radiance: csh-considered-harmful ./usr/bin/objline +radiance: csh-considered-harmful ./usr/bin/objpict +radiance: csh-considered-harmful ./usr/bin/objview +radiance: csh-considered-harmful ./usr/bin/optics2rad +radiance: csh-considered-harmful ./usr/bin/pbilat +radiance: csh-considered-harmful ./usr/bin/pdelta +radiance: csh-considered-harmful ./usr/bin/pdfblur +radiance: csh-considered-harmful ./usr/bin/pgblur +radiance: csh-considered-harmful ./usr/bin/phisto +radiance: csh-considered-harmful ./usr/bin/pmblur +radiance: csh-considered-harmful ./usr/bin/pmdblur +radiance: csh-considered-harmful ./usr/bin/ra_pfm +radiance: csh-considered-harmful ./usr/bin/raddepend +radiance: csh-considered-harmful ./usr/bin/ran2tiff +radiance: csh-considered-harmful ./usr/bin/rlux +radiance: csh-considered-harmful ./usr/bin/vinfo +radiance: csh-considered-harmful ./usr/bin/xyzimage --- radiance-4R0+20100729.orig/debian/lintian-overrides/radiance-sse3 +++ radiance-4R0+20100729/debian/lintian-overrides/radiance-sse3 @@ -0,0 +1,5 @@ +#the following binaries are diverted from the not optimized versions of the +#radiance package, manpages are provided there. +radiance-sse3: binary-without-manpage usr/bin/rpict +radiance-sse3: binary-without-manpage usr/bin/rtrace +radiance-sse3: binary-without-manpage usr/bin/rvu --- radiance-4R0+20100729.orig/debian/source/format +++ radiance-4R0+20100729/debian/source/format @@ -0,0 +1 @@ +1.0 --- radiance-4R0+20100729.orig/debian/patches/no-rview-please +++ radiance-4R0+20100729/debian/patches/no-rview-please @@ -0,0 +1,389 @@ +## no-rview-please.dpatch by Bernd Zeimetz +## +## DP: rview was renamed to rvu - seems some stuff still relies on rview... + +@DPATCH@ +--- a/obj/cabin/Makefile ++++ b/obj/cabin/Makefile +@@ -9,7 +9,7 @@ SCENE= summercabin + AMB= -av .1 .1 .1 + + view: $(SCENE).oct +- rview $(VIEW) $(AMB) $(SCENE).oct ++ rvu $(VIEW) $(AMB) $(SCENE).oct + + sholo: living.oct bed.oct bath.oct summer.hdk + rholo -n 1 -o ogl summer.hdk +--- a/obj/cabin/anim1/fmt ++++ b/obj/cabin/anim1/fmt +@@ -1 +1 @@ +-rview -vtv -vp ${px} ${py} ${pz} -vd ${dx} ${dy} ${dz} -vu ${ux} ${uy} ${uz} $(stuff) ++rvu -vtv -vp ${px} ${py} ${pz} -vd ${dx} ${dy} ${dz} -vu ${ux} ${uy} ${uz} $(stuff) +--- a/obj/cabin/anim1/join.keys ++++ b/obj/cabin/anim1/join.keys +@@ -1,2 +1,2 @@ +-rview -vtv -vp 21.1 11.97 4.2 -vd 0.971309 0.0625525 -0.229448 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2.5 +-rview -vtv -vp 23.9 12.2 6.2 -vd 0.757833 -0.312891 -0.572528 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 21.1 11.97 4.2 -vd 0.971309 0.0625525 -0.229448 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2.5 ++rvu -vtv -vp 23.9 12.2 6.2 -vd 0.757833 -0.312891 -0.572528 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +--- a/obj/cabin/anim1/keys ++++ b/obj/cabin/anim1/keys +@@ -1,55 +1,55 @@ +-rview -vtv -vp 4.7 12 4 -vd -0.924626 0.380866 0.00280397 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 0 -e 86 +-rview -vtv -vp 4.7 12 4 -vd -0.730485 0.489401 -0.476317 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .5 +-rview -vtv -vp 3.3 13.76 4.2 -vd -0.0427227 0.940831 -0.336174 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .75 -e 55 +-rview -vtv -vp 4.3 15.8 4.3 -vd 0.00622979 0.647051 -0.762421 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .75 -e 35 ++rvu -vtv -vp 4.7 12 4 -vd -0.924626 0.380866 0.00280397 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 0 -e 86 ++rvu -vtv -vp 4.7 12 4 -vd -0.730485 0.489401 -0.476317 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .5 ++rvu -vtv -vp 3.3 13.76 4.2 -vd -0.0427227 0.940831 -0.336174 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .75 -e 55 ++rvu -vtv -vp 4.3 15.8 4.3 -vd 0.00622979 0.647051 -0.762421 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .75 -e 35 + pause 2 seconds +-rview -vtv -vp 5.46 15.5 4.2 -vd 0.91674 0.347628 -0.196833 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 -e 120 +-rview -vtv -vp 10.5 15.6 4.2 -vd 0.9896 -0.1408 -0.0294619 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 20.4 13.7 4.2 -vd 0.680414 -0.680414 -0.272166 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 4 ++rvu -vtv -vp 5.46 15.5 4.2 -vd 0.91674 0.347628 -0.196833 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 -e 120 ++rvu -vtv -vp 10.5 15.6 4.2 -vd 0.9896 -0.1408 -0.0294619 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 20.4 13.7 4.2 -vd 0.680414 -0.680414 -0.272166 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 4 + pause 1 second +-rview -vtv -vp 22.9 12.2 6 -vd 0.609208 -0.609208 -0.507673 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 24 11.86 5.2 -vd 0.505147 -0.67245 -0.54096 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 24.86 11.2 6 -vd 0.274729 -0.821973 -0.498883 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 25.5 9.5 5.45 -vd -0.242521 -0.882347 -0.403295 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .5 +-rview -vtv -vp 25.4 6.8 5.45 -vd -0.5617 -0.785631 -0.259378 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 25.5 4.55 5.45 -vd -0.736555 -0.376866 -0.561657 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 24.5 2.75 4.2 -vd -0.799281 -0.163636 -0.57825 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 23.1 2.34 6.2 -vd -0.875962 -0.0409728 -0.480637 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 22.2 2.2 5.4 -vd -0.931792 0.318282 -0.17453 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 -e 100 +-rview -vtv -vp 18.4 2 5.4 -vd -0.768929 0.401349 -0.497662 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 16.5 2.5 6.35 -vd -0.273316 0.573355 -0.772375 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 16.25 3.86 6.25 -vd -0.101489 0.720453 -0.686038 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 -e 120 +-rview -vtv -vp 16.35 4.66 5.4 -vd -0.0488706 0.86004 -0.507881 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 16.1 6.4 5.4 -vd 0.241471 0.949711 -0.199351 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 16.6 8.25 5.3 -vd 0.657358 0.694674 -0.292077 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 17.7 9 4.2 -vd 0.829416 0.508562 -0.231157 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 22.9 12.2 6 -vd 0.609208 -0.609208 -0.507673 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 24 11.86 5.2 -vd 0.505147 -0.67245 -0.54096 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 24.86 11.2 6 -vd 0.274729 -0.821973 -0.498883 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 25.5 9.5 5.45 -vd -0.242521 -0.882347 -0.403295 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .5 ++rvu -vtv -vp 25.4 6.8 5.45 -vd -0.5617 -0.785631 -0.259378 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 25.5 4.55 5.45 -vd -0.736555 -0.376866 -0.561657 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 24.5 2.75 4.2 -vd -0.799281 -0.163636 -0.57825 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 23.1 2.34 6.2 -vd -0.875962 -0.0409728 -0.480637 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 22.2 2.2 5.4 -vd -0.931792 0.318282 -0.17453 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 -e 100 ++rvu -vtv -vp 18.4 2 5.4 -vd -0.768929 0.401349 -0.497662 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 16.5 2.5 6.35 -vd -0.273316 0.573355 -0.772375 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 16.25 3.86 6.25 -vd -0.101489 0.720453 -0.686038 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 -e 120 ++rvu -vtv -vp 16.35 4.66 5.4 -vd -0.0488706 0.86004 -0.507881 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 16.1 6.4 5.4 -vd 0.241471 0.949711 -0.199351 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 16.6 8.25 5.3 -vd 0.657358 0.694674 -0.292077 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 17.7 9 4.2 -vd 0.829416 0.508562 -0.231157 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 + repeat previous circle around furniture +-rview -vtv -vp 18.2 11.2 4.2 -vd -0.663625 0.733674 -0.146031 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 14.8 11.1 4.2 -vd -0.845272 -0.514322 -0.144873 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 12.1 8.66 4.2 -vd -0.845272 -0.514322 -0.144873 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 8.25 4 4.2 -vd -0.997702 0.0138135 -0.0663361 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1.5 +-rview -vtv -vp 5.3 3.75 5.7 -vd -0.972188 0.206184 -0.111081 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 +-rview -vtv -vp 4.6 3.5 6.05 -vd -0.927954 0.356177 -0.109723 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.7 5.6 -vd -0.827968 0.514747 -0.222497 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.5 3.7 6 -vd -0.666529 0.711501 -0.222497 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.55 3.8 5.7 -vd -0.429382 0.875286 -0.222497 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.5 3.75 6.1 -vd 0.0352089 0.942608 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.7 5.6 -vd 0.277974 0.901377 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.65 3.6 6.1 -vd 0.48778 0.807354 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.5 5.6 -vd 0.691421 0.641628 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.65 3.55 6.1 -vd 0.848803 0.41144 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.7 3.6 5.6 -vd 0.934402 0.129008 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.75 3.7 6.1 -vd 0.928534 -0.166052 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.7 3.7 5.7 -vd 0.823885 -0.459307 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.65 3.65 6 -vd 0.641628 -0.691421 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.65 5.7 -vd 0.381566 -0.862645 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.7 6.1 -vd 0.0141714 -0.943159 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.75 5.6 -vd -0.400716 -0.853918 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.55 3.75 6.1 -vd -0.77399 -0.539156 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.5 3.7 5.6 -vd -0.911715 -0.241921 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.5 3.6 6.1 -vd -0.942265 0.0434335 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.7 5.6 -vd -0.827962 0.514976 -0.22199 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 +-rview -vtv -vp 3.6 3.7 5.8 -vd -0.827962 0.514976 -0.22199 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 +-rview -vtv -vp 3 3.8 4 -vd -0.324443 0.811107 -0.486664 -vu -0.707107 0 0.707107 -vh 60 -vv 49 -vs 0 -vl 0 -t .8 +-rview -vtv -vp 2 3.9 3.1 -vd 0.0569963 0.969582 -0.238038 -vu -0.957826 0 0.287348 -vh 60 -vv 49 -vs 0 -vl 0 -t .6 +-rview -vtv -vp 1.1 4 2.6 -vd 0.329848 0.943706 0.0248832 -vu -0.998752 0 0.0499376 -vh 60 -vv 49 -vs 0 -vl 0 -t .5 ++rvu -vtv -vp 18.2 11.2 4.2 -vd -0.663625 0.733674 -0.146031 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 14.8 11.1 4.2 -vd -0.845272 -0.514322 -0.144873 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 12.1 8.66 4.2 -vd -0.845272 -0.514322 -0.144873 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 8.25 4 4.2 -vd -0.997702 0.0138135 -0.0663361 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1.5 ++rvu -vtv -vp 5.3 3.75 5.7 -vd -0.972188 0.206184 -0.111081 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 1 ++rvu -vtv -vp 4.6 3.5 6.05 -vd -0.927954 0.356177 -0.109723 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.7 5.6 -vd -0.827968 0.514747 -0.222497 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.5 3.7 6 -vd -0.666529 0.711501 -0.222497 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.55 3.8 5.7 -vd -0.429382 0.875286 -0.222497 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.5 3.75 6.1 -vd 0.0352089 0.942608 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.7 5.6 -vd 0.277974 0.901377 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.65 3.6 6.1 -vd 0.48778 0.807354 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.5 5.6 -vd 0.691421 0.641628 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.65 3.55 6.1 -vd 0.848803 0.41144 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.7 3.6 5.6 -vd 0.934402 0.129008 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.75 3.7 6.1 -vd 0.928534 -0.166052 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.7 3.7 5.7 -vd 0.823885 -0.459307 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.65 3.65 6 -vd 0.641628 -0.691421 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.65 5.7 -vd 0.381566 -0.862645 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.7 6.1 -vd 0.0141714 -0.943159 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.75 5.6 -vd -0.400716 -0.853918 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.55 3.75 6.1 -vd -0.77399 -0.539156 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.5 3.7 5.6 -vd -0.911715 -0.241921 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.5 3.6 6.1 -vd -0.942265 0.0434335 -0.33204 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.7 5.6 -vd -0.827962 0.514976 -0.22199 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t .35 ++rvu -vtv -vp 3.6 3.7 5.8 -vd -0.827962 0.514976 -0.22199 -vu 0 0 1 -vh 60 -vv 49 -vs 0 -vl 0 -t 2 ++rvu -vtv -vp 3 3.8 4 -vd -0.324443 0.811107 -0.486664 -vu -0.707107 0 0.707107 -vh 60 -vv 49 -vs 0 -vl 0 -t .8 ++rvu -vtv -vp 2 3.9 3.1 -vd 0.0569963 0.969582 -0.238038 -vu -0.957826 0 0.287348 -vh 60 -vv 49 -vs 0 -vl 0 -t .6 ++rvu -vtv -vp 1.1 4 2.6 -vd 0.329848 0.943706 0.0248832 -vu -0.998752 0 0.0499376 -vh 60 -vv 49 -vs 0 -vl 0 -t .5 +--- a/obj/cabin/vf/aerial ++++ b/obj/cabin/vf/aerial +@@ -1 +1 @@ +-rview -vtv -vp 64.825 -90.7048 81.4822 -vd -0.399565 0.692276 -0.600917 -vu 0 0 1 -vh 30 -vv 25 -vs 0 -vl 0 ++rvu -vtv -vp 64.825 -90.7048 81.4822 -vd -0.399565 0.692276 -0.600917 -vu 0 0 1 -vh 30 -vv 25 -vs 0 -vl 0 +--- a/obj/cabin/vf/bath ++++ b/obj/cabin/vf/bath +@@ -1,3 +1,3 @@ +-rview -vtv -vp 8 14.5 5 -vd -0.894427 0.447214 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +-rview -vtv -vp 8 14.5 5 -vd -0.874456 0.309256 -0.373747 -vu 0 0 1 -vh 60 -vv 60 -vs 0 -vl 0 +-rview -vtv -vp 8 14.5 5 -vd -0.868092 0.4275 -0.252309 -vu 0 0 1 -vh 45 -vv 60 -vo 0 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 8 14.5 5 -vd -0.894427 0.447214 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 8 14.5 5 -vd -0.874456 0.309256 -0.373747 -vu 0 0 1 -vh 60 -vv 60 -vs 0 -vl 0 ++rvu -vtv -vp 8 14.5 5 -vd -0.868092 0.4275 -0.252309 -vu 0 0 1 -vh 45 -vv 60 -vo 0 -va 0 -vs 0 -vl 0 +--- a/obj/cabin/vf/bed ++++ b/obj/cabin/vf/bed +@@ -1 +1 @@ +-rview -vtv -vp 9 12 5 -vd -0.506826 -0.822516 -0.258059 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 9 12 5 -vd -0.506826 -0.822516 -0.258059 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +--- a/obj/cabin/vf/bed.leepl ++++ b/obj/cabin/vf/bed.leepl +@@ -1 +1 @@ +-rview -vth -vp 7.66807 9.29035 5.55989 -vd -0.583978 -0.790403 -0.185019 -vu 0 0 1 -vh 120 -vv 120 -vs 0 -vl 0 ++rvu -vth -vp 7.66807 9.29035 5.55989 -vd -0.583978 -0.790403 -0.185019 -vu 0 0 1 -vh 120 -vv 120 -vs 0 -vl 0 +--- a/obj/cabin/vf/bed.leepr ++++ b/obj/cabin/vf/bed.leepr +@@ -1 +1 @@ +-rview -vth -vp 7.5034 9.412 5.55989 -vd -0.583978 -0.790403 -0.185019 -vu 0 0 1 -vh 120 -vv 120 -vs 0 -vl 0 ++rvu -vth -vp 7.5034 9.412 5.55989 -vd -0.583978 -0.790403 -0.185019 -vu 0 0 1 -vh 120 -vv 120 -vs 0 -vl 0 +--- a/obj/cabin/vf/bedroom ++++ b/obj/cabin/vf/bedroom +@@ -1,2 +1,2 @@ +-rview -vtv -vp 1.20683 2.12314 3.95566 -vd 0.781959 0.61206 -0.117997 -vu 0 0 1 -vh 40 -vv 30 -vs 0 -vl 0 +-rview -vtv -vp 0.5 0.5 5 -vd 0.638787 0.751662 -0.164179 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 1.20683 2.12314 3.95566 -vd 0.781959 0.61206 -0.117997 -vu 0 0 1 -vh 40 -vv 30 -vs 0 -vl 0 ++rvu -vtv -vp 0.5 0.5 5 -vd 0.638787 0.751662 -0.164179 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +--- a/obj/cabin/vf/coatrack ++++ b/obj/cabin/vf/coatrack +@@ -1 +1 @@ +-rview -vtv -vp 22 12 5 -vd 0.563075 0.755671 -0.334526 -vu 0 0 1 -vh 40 -vv 55 -vs 0 -vl 0 ++rvu -vtv -vp 22 12 5 -vd 0.563075 0.755671 -0.334526 -vu 0 0 1 -vh 40 -vv 55 -vs 0 -vl 0 +--- a/obj/cabin/vf/corner ++++ b/obj/cabin/vf/corner +@@ -1,3 +1,3 @@ +-rview -vtv -vp 22.4986 3.54532 3.96568 -vd -0.910534 -0.363276 -0.19738 -vu 0 0 1 -vh 51.7865 -vv 45 -vo 0 -va 0 -vs 0 -vl 0 +-rview -vtv -vp 22.4986 3.54532 3.96568 -vd -0.919145 -0.363618 -0.151507 -vu 0 0 1 -vh 51.7865 -vv 45 -vo 0 -va 0 -vs 0 -vl 0 +-rview -vtv -vp 22.4986 3.54532 3.96568 -vd -0.929463 -0.3677 -0.0299152 -vu 0 0 1 -vh 51.7865 -vv 45 -vo 0 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 22.4986 3.54532 3.96568 -vd -0.910534 -0.363276 -0.19738 -vu 0 0 1 -vh 51.7865 -vv 45 -vo 0 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 22.4986 3.54532 3.96568 -vd -0.919145 -0.363618 -0.151507 -vu 0 0 1 -vh 51.7865 -vv 45 -vo 0 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 22.4986 3.54532 3.96568 -vd -0.929463 -0.3677 -0.0299152 -vu 0 0 1 -vh 51.7865 -vv 45 -vo 0 -va 0 -vs 0 -vl 0 +--- a/obj/cabin/vf/ext.ne ++++ b/obj/cabin/vf/ext.ne +@@ -1 +1 @@ +-rview -vtv -vp 58.0405 72.6078 41.9572 -vd -0.521721 -0.721022 -0.455998 -vu 0 0 1 -vh 27.7007 -vv 27.7007 -vs 0 -vl 0 ++rvu -vtv -vp 58.0405 72.6078 41.9572 -vd -0.521721 -0.721022 -0.455998 -vu 0 0 1 -vh 27.7007 -vv 27.7007 -vs 0 -vl 0 +--- a/obj/cabin/vf/ext.se ++++ b/obj/cabin/vf/ext.se +@@ -1 +1 @@ +-rview -vtv -vp 47.9362 -54.2003 40.135 -vd -0.445657 0.772134 -0.452989 -vu 0 0 1 -vh 30 -vv 25 -vs 0 -vl 0 ++rvu -vtv -vp 47.9362 -54.2003 40.135 -vd -0.445657 0.772134 -0.452989 -vu 0 0 1 -vh 30 -vv 25 -vs 0 -vl 0 +--- a/obj/cabin/vf/fireplace ++++ b/obj/cabin/vf/fireplace +@@ -1 +1 @@ +-rview -vtv -vp 12.867 10.3625 4.60554 -vd 0.958111 -0.223918 -0.178561 -vu 0 0 1 -vh 23.6949 -vv 23.6949 -vs 0 -vl 0 ++rvu -vtv -vp 12.867 10.3625 4.60554 -vd 0.958111 -0.223918 -0.178561 -vu 0 0 1 -vh 23.6949 -vv 23.6949 -vs 0 -vl 0 +--- a/obj/cabin/vf/interior ++++ b/obj/cabin/vf/interior +@@ -1 +1 @@ +-rview -vtv -vp 26 9.4 5 -vd -0.952099 0.304778 -0.0248474 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 26 9.4 5 -vd -0.952099 0.304778 -0.0248474 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +--- a/obj/cabin/vf/liv3 ++++ b/obj/cabin/vf/liv3 +@@ -1,2 +1,2 @@ +-rview -vtv -vp 26 10 3.5 -vd -1 0 0 -vu 0 0 1 -vh 60 -vv 60 -vo 0 -va 0 -vs 0 -vl 0 +-rview -vtv -vp 26 10 3.5 -vd -1 0 0 -vu 0 0 1 -vh 60 -vv 60 -vo 4 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 26 10 3.5 -vd -1 0 0 -vu 0 0 1 -vh 60 -vv 60 -vo 0 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 26 10 3.5 -vd -1 0 0 -vu 0 0 1 -vh 60 -vv 60 -vo 4 -va 0 -vs 0 -vl 0 +--- a/obj/cabin/vf/liv4 ++++ b/obj/cabin/vf/liv4 +@@ -1 +1 @@ +-rview -vtv -vp 25.7995 12.8471 3.34734 -vd -0.984808 -0.173648 0 -vu 0 0 1 -vh 60 -vv 60 -vo 4 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 25.7995 12.8471 3.34734 -vd -0.984808 -0.173648 0 -vu 0 0 1 -vh 60 -vv 60 -vo 4 -va 0 -vs 0 -vl 0 +--- a/obj/cabin/vf/liv7 ++++ b/obj/cabin/vf/liv7 +@@ -1 +1 @@ +-rview -vtv -vp 25.1293 15.4706 3.31179 -vd -0.939693 -0.34202 0 -vu 0 0 1 -vh 60 -vv 60 -vo 4 -va 0 -vs 0 -vl 0 ++rvu -vtv -vp 25.1293 15.4706 3.31179 -vd -0.939693 -0.34202 0 -vu 0 0 1 -vh 60 -vv 60 -vo 4 -va 0 -vs 0 -vl 0 +--- a/obj/cabin/vf/living ++++ b/obj/cabin/vf/living +@@ -1 +1 @@ +-rview -vtv -vp 12.5 0.5 5 -vd 0.707107 0.707107 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 12.5 0.5 5 -vd 0.707107 0.707107 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +--- a/obj/cabin/vf/living.fish ++++ b/obj/cabin/vf/living.fish +@@ -1 +1 @@ +-rview -vta -vp 15 9 5 -vd 1 0 0 -vu 0 0 1 -vh 240 -vv 180 -vs 0 -vl 0 ++rvu -vta -vp 15 9 5 -vd 1 0 0 -vu 0 0 1 -vh 240 -vv 180 -vs 0 -vl 0 +--- a/obj/cabin/vf/living2 ++++ b/obj/cabin/vf/living2 +@@ -1,3 +1,3 @@ +-rview -vtv -vp 26.5 17.5 5 -vd -0.980581 -0.196116 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +-rview -vtv -vp 26.5 17.5 5 -vd -0.662847 -0.740421 -0.111404 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +-rview -vtv -vp 26.8 16.8 5 -vd -0.662847 -0.740421 -0.111404 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 26.5 17.5 5 -vd -0.980581 -0.196116 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 26.5 17.5 5 -vd -0.662847 -0.740421 -0.111404 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 26.8 16.8 5 -vd -0.662847 -0.740421 -0.111404 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +--- a/obj/cabin/vf/plan ++++ b/obj/cabin/vf/plan +@@ -1 +1 @@ +-rview -vtl -vp 13.5 9 4 -vd 0 0 -1 -vu 0 1 0 -vh 27 -vv 18 -vs 0 -vl 0 ++rvu -vtl -vp 13.5 9 4 -vd 0 0 -1 -vu 0 1 0 -vh 27 -vv 18 -vs 0 -vl 0 +--- a/obj/cabin/vf/top ++++ b/obj/cabin/vf/top +@@ -1,2 +1,2 @@ +-rview -vtv -vp 14.3846 -55.8279 63.7164 -vd 0 0.707107 -0.707107 -vu 0 0 1 -vh 45 -vv 45 -vs 0 -vl 0 +-rview -vtv -vp 62.9669 -16.2963 53.0042 -vd -0.632252 0.367724 -0.681936 -vu 0 0 1 -vh 32.9635 -vv 32.9635 -vs 0 -vl 0 ++rvu -vtv -vp 14.3846 -55.8279 63.7164 -vd 0 0.707107 -0.707107 -vu 0 0 1 -vh 45 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 62.9669 -16.2963 53.0042 -vd -0.632252 0.367724 -0.681936 -vu 0 0 1 -vh 32.9635 -vv 32.9635 -vs 0 -vl 0 +--- a/obj/misc/Makefile ++++ b/obj/misc/Makefile +@@ -5,7 +5,7 @@ + DEV=x11 + + daf: daf.oct +- rview -o $(DEV) -vp 50 60 40 -vd 0 -0.707107 -0.707107 -vu 0 1 0 \ ++ rvu -o $(DEV) -vp 50 60 40 -vd 0 -0.707107 -0.707107 -vu 0 1 0 \ + -vh 20 -vv 20 -av .2 .2 .2 daf.oct + + daffodil.pic: daf.oct +@@ -19,7 +19,7 @@ daffodil.xf: daffodil + xform -e -rz -40 -t 50 40 20 daffodil > daffodil.xf + + exm: examp.oct +- rview -o $(DEV) -vp 3 2 5 -vd -0.268328 -0.357771 -0.894427 \ ++ rvu -o $(DEV) -vp 3 2 5 -vd -0.268328 -0.357771 -0.894427 \ + -vu 0 1 0 -vh 45 -vv 45 -av .25 .25 .25 examp.oct + + examp.pic: examp.oct +--- a/obj/misc/daffodil.vp ++++ b/obj/misc/daffodil.vp +@@ -1 +1 @@ +-rview -vp 50 60 40 -vd 0 -0.707107 -0.707107 -vu 0 1 0 -vh 20 -vv 20 -x 470 -y 470 ++rvu -vp 50 60 40 -vd 0 -0.707107 -0.707107 -vu 0 1 0 -vh 20 -vv 20 -x 470 -y 470 +--- a/obj/misc/examp.vp ++++ b/obj/misc/examp.vp +@@ -1 +1 @@ +-rview -vp 3 2 5 -vd -0.268328 -0.357771 -0.894427 -vu 0 1 0 -vh 45 -vv 45 -x 470 -y 470 ++rvu -vp 3 2 5 -vd -0.268328 -0.357771 -0.894427 -vu 0 1 0 -vh 45 -vv 45 -x 470 -y 470 +--- a/obj/office/Makefile ++++ b/obj/office/Makefile +@@ -6,7 +6,7 @@ VIEW = -vp 8 36 -27 -vd -.46 -.23 .79 -v + DEV = x11 + + view1: model.oct +- rview $(VIEW) -o $(DEV) -av .1 .1 .1 model.oct ++ rvu $(VIEW) -o $(DEV) -av .1 .1 .1 model.oct + + display: /usr2/greg/pic/model.new + ximage =+50+50 -f /usr2/greg/pic/model.new +--- a/obj/office/book.vp ++++ b/obj/office/book.vp +@@ -1,3 +1,3 @@ +-rview -vp -25 36 25 -vd 0.0885656 -0.437046 -0.895068 -vu 0 1 0 -vh 16.5224 -vv 11.1805 -x 1000 -y 676 +-rview -vp -13.8209 31.2191 -2.57023 -vd -0.761583 -0.55009 0.342625 -vu 0 1 0 -vh 30.8742 -vv 30.8742 -x 800 -y 800 +-rview -vp -20 33 -3.5 -vd -0.254777 -0.832881 0.491322 -vu 0 1 0 -vh 30.8742 -vv 30.8742 -x 800 -y 800 ++rvu -vp -25 36 25 -vd 0.0885656 -0.437046 -0.895068 -vu 0 1 0 -vh 16.5224 -vv 11.1805 -x 1000 -y 676 ++rvu -vp -13.8209 31.2191 -2.57023 -vd -0.761583 -0.55009 0.342625 -vu 0 1 0 -vh 30.8742 -vv 30.8742 -x 800 -y 800 ++rvu -vp -20 33 -3.5 -vd -0.254777 -0.832881 0.491322 -vu 0 1 0 -vh 30.8742 -vv 30.8742 -x 800 -y 800 +--- a/obj/office/chair2.vp ++++ b/obj/office/chair2.vp +@@ -1,2 +1,2 @@ +-rview -vtv -vp 18.7204 34.1614 -7.45533 -vd -0.946595 -0.224341 0.231581 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 +-rview -vtv -vp 18.7 36 -7.5 -vd -0.936836 -0.266259 0.226813 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 ++rvu -vtv -vp 18.7204 34.1614 -7.45533 -vd -0.946595 -0.224341 0.231581 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 ++rvu -vtv -vp 18.7 36 -7.5 -vd -0.936836 -0.266259 0.226813 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 +--- a/obj/office/closeup.vp ++++ b/obj/office/closeup.vp +@@ -1 +1 @@ +-rview -vtv -vp -6.94171 28.0803 -12.3719 -vd -0.487983 -0.243991 0.838058 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 ++rvu -vtv -vp -6.94171 28.0803 -12.3719 -vd -0.487983 -0.243991 0.838058 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 +--- a/obj/office/model.vp ++++ b/obj/office/model.vp +@@ -1,3 +1,3 @@ +-rview -vp 0 36 -25 -vd -0.357771 -0.268328 0.894427 -vu 0 1 0 -vh 45 -vv 45 -x 800 -y 800 +-rview -vp -3 36 -25 -vd -0.357771 -0.268328 0.894427 -vu 0 1 0 -vh 45 -vv 45 -x 800 -y 800 +-rview -vp 8 36 -27 -vd -0.560723 -0.233635 0.794358 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 ++rvu -vp 0 36 -25 -vd -0.357771 -0.268328 0.894427 -vu 0 1 0 -vh 45 -vv 45 -x 800 -y 800 ++rvu -vp -3 36 -25 -vd -0.357771 -0.268328 0.894427 -vu 0 1 0 -vh 45 -vv 45 -x 800 -y 800 ++rvu -vp 8 36 -27 -vd -0.560723 -0.233635 0.794358 -vu 0 1 0 -vh 39.9 -vv 27.5 -x 1000 -y 676 +--- a/obj/virtual/Makefile ++++ b/obj/virtual/Makefile +@@ -11,7 +11,7 @@ DIR=-dr 2 -dp 64 -dj .5 + RPOPTS=-t 1800 -ps 1 + + view: $(SCENE).oct +- rview $(VIEW) -o $(DEV) $(AMB) $(DIR) $(SCENE).oct ++ rvu $(VIEW) -o $(DEV) $(AMB) $(DIR) $(SCENE).oct + + picture: $(SCENE)_$(VW).pic + +--- a/obj/virtual/back.vp ++++ b/obj/virtual/back.vp +@@ -1,2 +1,2 @@ +-rview -vtv -vp 0.1 7.9 2 -vd 0.5547 -0.83205 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +-rview -vtv -vp 0.1 7.9 2 -vd 0.560199 -0.81744 -0.134051 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 0.1 7.9 2 -vd 0.5547 -0.83205 0 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 ++rvu -vtv -vp 0.1 7.9 2 -vd 0.560199 -0.81744 -0.134051 -vu 0 0 1 -vh 60 -vv 45 -vs 0 -vl 0 +--- a/obj/virtual/ceil.vp ++++ b/obj/virtual/ceil.vp +@@ -1 +1 @@ +-rview -vtl -vp 3 4 2.25 -vd 0 0 1 -vu 1 0 0 -vh 8 -vv 6 -vs 0 -vl 0 ++rvu -vtl -vp 3 4 2.25 -vd 0 0 1 -vu 1 0 0 -vh 8 -vv 6 -vs 0 -vl 0 +--- a/obj/virtual/outside.vp ++++ b/obj/virtual/outside.vp +@@ -1,2 +1,2 @@ + VIEW= -vp -10 -10 5 -vd 1 1 -.5 +-rview -vtv -vp -34.3862 -18.695 11.6818 -vd 0.886789 0.382957 -0.258747 -vu 0 0 1 -vh 30 -vv 20 -vs 0 -vl 0 ++rvu -vtv -vp -34.3862 -18.695 11.6818 -vd 0.886789 0.382957 -0.258747 -vu 0 0 1 -vh 30 -vv 20 -vs 0 -vl 0 +--- a/src/px/pacuity.csh ++++ b/src/px/pacuity.csh +@@ -73,7 +73,7 @@ end + set pf=( $pf $ifile ) + rcalc -n -e "$vp" -e "A:3879*sqrt(Vhn/$pres[1]*Vvn/$pres[2])" \ + -o '${60/A});' >> $tfc1 +-getinfo < $ifile | egrep '^((VIEW|EXPOSURE|PIXASPECT|PRIMARIES|COLORCORR)=|[^ ]*(rpict|rview|pinterp) )' ++getinfo < $ifile | egrep '^((VIEW|EXPOSURE|PIXASPECT|PRIMARIES|COLORCORR)=|[^ ]*(rpict|rvu|pinterp) )' + pcomb -f $tfc1 $pf + quit: + rm -f $tf +--- a/src/px/psquish.csh ++++ b/src/px/psquish.csh +@@ -191,7 +191,7 @@ _EOF_ + endif + endif + # Map our picture +-getinfo < $ifile | egrep '^((VIEW|PIXASPECT|PRIMARIES)=|[^ ]*(rpict|rview|pinterp) )' ++getinfo < $ifile | egrep '^((VIEW|PIXASPECT|PRIMARIES)=|[^ ]*(rpict|rvu|pinterp) )' + pcomb -f $tf4 -f $tf3 $ifile + quit: + rm -f $tf +--- a/src/px/pveil.csh ++++ b/src/px/pveil.csh +@@ -36,7 +36,7 @@ ro = ri(1) + veil; + go = gi(1) + veil; + bo = bi(1) + veil; + '_EOF_' +-getinfo < $ifile | egrep '^((VIEW|EXPOSURE|PIXASPECT|PRIMARIES|COLORCORR)=|[^ ]*(rpict|rview|pinterp) )' ++getinfo < $ifile | egrep '^((VIEW|EXPOSURE|PIXASPECT|PRIMARIES|COLORCORR)=|[^ ]*(rpict|rvu|pinterp) )' + pcomb -f $cf $ifile + quit: + rm -f $tf --- radiance-4R0+20100729.orig/debian/patches/rename-genbox-lib +++ radiance-4R0+20100729/debian/patches/rename-genbox-lib @@ -0,0 +1,174 @@ +## rename-genbox-lib.dpatch by Bernd Zeimetz +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- a/lib/lib/testroom ++++ b/lib/lib/testroom +@@ -28,7 +28,7 @@ bright sphere lamp2 + 4 0 4 4 .1 + + # xform -t -5 -5 -5 +-# genbox wall_mat box 10 10 10 ++# genrbox wall_mat box 10 10 10 + + wall_mat polygon box.1540 + 0 +--- a/lib/source/spi/std33 ++++ b/lib/source/spi/std33 +@@ -25,7 +25,7 @@ std33_output glow std33_light + 4 20.66 20.66 20.66 150 + + # xform -t -3.75 -5 -2 +-# genbox dark_plastic std33 7.5 10 2 ++# genrbox dark_plastic std33 7.5 10 2 + + dark_plastic polygon std33.1540 + 0 +--- a/lib/source/zumtobel/SID-C2.rad ++++ b/lib/source/zumtobel/SID-C2.rad +@@ -205,7 +205,7 @@ bivergence polygon louvre_side2 + + # xform -n a0 -t 0 -21 0 -i 0 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a0.louvre.1540 + 0 +@@ -262,7 +262,7 @@ bivergence polygon a0.louvre.6457 + 2.522 -20.95 -23 + # xform -n a1 -t 0 -21 0 -i 1 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a1.louvre.1540 + 0 +@@ -319,7 +319,7 @@ bivergence polygon a1.louvre.6457 + 2.522 -17.95 -23 + # xform -n a2 -t 0 -21 0 -i 2 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a2.louvre.1540 + 0 +@@ -376,7 +376,7 @@ bivergence polygon a2.louvre.6457 + 2.522 -14.95 -23 + # xform -n a3 -t 0 -21 0 -i 3 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a3.louvre.1540 + 0 +@@ -433,7 +433,7 @@ bivergence polygon a3.louvre.6457 + 2.522 -11.95 -23 + # xform -n a4 -t 0 -21 0 -i 4 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a4.louvre.1540 + 0 +@@ -490,7 +490,7 @@ bivergence polygon a4.louvre.6457 + 2.522 -8.95 -23 + # xform -n a5 -t 0 -21 0 -i 5 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a5.louvre.1540 + 0 +@@ -547,7 +547,7 @@ bivergence polygon a5.louvre.6457 + 2.522 -5.95 -23 + # xform -n a6 -t 0 -21 0 -i 6 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a6.louvre.1540 + 0 +@@ -604,7 +604,7 @@ bivergence polygon a6.louvre.6457 + 2.522 -2.95 -23 + # xform -n a7 -t 0 -21 0 -i 7 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a7.louvre.1540 + 0 +@@ -661,7 +661,7 @@ bivergence polygon a7.louvre.6457 + 2.522 0.05 -23 + # xform -n a8 -t 0 -21 0 -i 8 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a8.louvre.1540 + 0 +@@ -718,7 +718,7 @@ bivergence polygon a8.louvre.6457 + 2.522 3.05 -23 + # xform -n a9 -t 0 -21 0 -i 9 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a9.louvre.1540 + 0 +@@ -775,7 +775,7 @@ bivergence polygon a9.louvre.6457 + 2.522 6.05 -23 + # xform -n a10 -t 0 -21 0 -i 10 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a10.louvre.1540 + 0 +@@ -832,7 +832,7 @@ bivergence polygon a10.louvre.6457 + 2.522 9.05 -23 + # xform -n a11 -t 0 -21 0 -i 11 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a11.louvre.1540 + 0 +@@ -889,7 +889,7 @@ bivergence polygon a11.louvre.6457 + 2.522 12.05 -23 + # xform -n a12 -t 0 -21 0 -i 12 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a12.louvre.1540 + 0 +@@ -946,7 +946,7 @@ bivergence polygon a12.louvre.6457 + 2.522 15.05 -23 + # xform -n a13 -t 0 -21 0 -i 13 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a13.louvre.1540 + 0 +@@ -1003,7 +1003,7 @@ bivergence polygon a13.louvre.6457 + 2.522 18.05 -23 + # xform -n a14 -t 0 -21 0 -i 14 -t 0 3 0 + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon a14.louvre.1540 + 0 +--- a/lib/source/zumtobel/louvre ++++ b/lib/source/zumtobel/louvre +@@ -1,5 +1,5 @@ + # xform -t -2.522 -.05 -25.345 +-# genbox bivergence louvre 5.044 .1 2.345 ++# genrbox bivergence louvre 5.044 .1 2.345 + + bivergence polygon louvre.1540 + 0 --- radiance-4R0+20100729.orig/debian/patches/cal-Rmakefile-missing-deps +++ radiance-4R0+20100729/debian/patches/cal-Rmakefile-missing-deps @@ -0,0 +1,16 @@ +From a040198bc34807173d0650ccb4fbe2a68975c1c2 Mon Sep 17 00:00:00 2001 +From: Bernd Zeimetz +Date: Tue, 6 May 2008 02:21:40 +0200 +Subject: [PATCH] Update cal/Rmakefile to be able to use the system's libtiff. + +Also add a proper dependency on rtmath.h and tifftypes.h for tabfunc.o. + +--- a/src/cal/Rmakefile ++++ b/src/cal/Rmakefile +@@ -59,3 +59,6 @@ calc.o ev.o rcalc.o: ../common/calcomp.h + total.o rcalc.o: ../common/platform.h + + rcalc.o: ../common/rterror.h ../common/rtmisc.h ../common/rtio.h ++ ++tabfunc.o: ../common/rtmath.h ++ --- radiance-4R0+20100729.orig/debian/patches/no-hardlinks +++ radiance-4R0+20100729/debian/patches/no-hardlinks @@ -0,0 +1,70 @@ +## no-hardlinks.dpatch by Bernd Zeimetz +## +## DP: we don't want and need hardlinks for those files, +## DP: especially because dh_strip chokes on them. + +@DPATCH@ +--- a/src/hd/Rmakefile ++++ b/src/hd/Rmakefile +@@ -14,6 +14,8 @@ MLIB = -lm + + CC = cc + ++LN = ln ++ + SPECIAL = + + INSTDIR = /usr/local/bin +@@ -72,7 +74,7 @@ genrhgrid: genrhgrid.o holo.o + + $(DEVDIR)/x11h.hdi: $(DEVDIR)/x11.hdi + rm -f $(DEVDIR)/x11h.hdi +- ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi ++ $(LN) x11.hdi $(DEVDIR)/x11h.hdi + + $(DEVDIR)/x11.hdi: rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \ + rhd_qtree2r.o rhd_ctab.o holo.o +@@ -81,35 +83,35 @@ rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ + + $(DEVDIR)/glx1h.hdi: $(DEVDIR)/glx1.hdi + rm -f $(DEVDIR)/glx1h.hdi +- ln $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi ++ $(LN) glx1.hdi $(DEVDIR)/glx1h.hdi + + $(DEVDIR)/glxoh.hdi: $(DEVDIR)/glxo.hdi + rm -f $(DEVDIR)/glxoh.hdi +- ln $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi ++ $(LN) glxo.hdi $(DEVDIR)/glxoh.hdi + + $(DEVDIR)/glxsh.hdi: $(DEVDIR)/glxs.hdi + rm -f $(DEVDIR)/glxsh.hdi +- ln $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi ++ $(LN) glxs.hdi $(DEVDIR)/glxsh.hdi + + $(DEVDIR)/glxsoh.hdi: $(DEVDIR)/glxso.hdi + rm -f $(DEVDIR)/glxsoh.hdi +- ln $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi ++ $(LN) glxso.hdi $(DEVDIR)/glxsoh.hdi + + $(DEVDIR)/oglh.hdi: $(DEVDIR)/ogl.hdi + rm -f $(DEVDIR)/oglh.hdi +- ln $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi ++ $(LN) ogl.hdi $(DEVDIR)/oglh.hdi + + $(DEVDIR)/ogloh.hdi: $(DEVDIR)/oglo.hdi + rm -f $(DEVDIR)/ogloh.hdi +- ln $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi ++ $(LN) oglo.hdi $(DEVDIR)/ogloh.hdi + + $(DEVDIR)/oglsh.hdi: $(DEVDIR)/ogls.hdi + rm -f $(DEVDIR)/oglsh.hdi +- ln $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi ++ $(LN) ogls.hdi $(DEVDIR)/oglsh.hdi + + $(DEVDIR)/oglsoh.hdi: $(DEVDIR)/oglso.hdi + rm -f $(DEVDIR)/oglsoh.hdi +- ln $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi ++ $(LN) oglso.hdi $(DEVDIR)/oglsoh.hdi + + $(DEVDIR)/glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \ + rhd_qtree.o rhd_qtree2c.o holo.o --- radiance-4R0+20100729.orig/debian/patches/manpage-fixes +++ radiance-4R0+20100729/debian/patches/manpage-fixes @@ -0,0 +1,32 @@ +--- a/doc/man/man1/rad.1 ++++ b/doc/man/man1/rad.1 +@@ -303,7 +303,7 @@ The letters indicate the desired view po + means maximum X, lower case means minimum and so on. + The final letter is the view type, where 'v' is perspective (the + default), 'l' is parallel, 'c' is a cylindrical panorama, +-'a' is angular fisheye, 'h' is hemispherical fisheye, and 's' ++\'a' is angular fisheye, 'h' is hemispherical fisheye, and 's' + is a planisphere (stereographic) fisheye. + A perspective view from maximum X, minimum Y would be "Xy" or "Xyv". + A parallel view from maximum Z would be "Zl". +--- a/doc/man/man1/rsensor.1 ++++ b/doc/man/man1/rsensor.1 +@@ -105,7 +105,7 @@ standard input. + .SH EXAMPLES + To compute values for the same sensor with two different positions: + .IP "" .2i +-rsensor -ab 2 -vf posA.vf mysens.dat -vf posB.vf mysens.dat scene.oct ++rsensor \-ab 2 \-vf posA.vf mysens.dat \-vf posB.vf mysens.dat scene.oct + .SH ENVIRONMENT + RAYPATH the directories to check for auxiliary files. + .SH AUTHOR +--- a/doc/man/man1/rtcontrib.1 ++++ b/doc/man/man1/rtcontrib.1 +@@ -28,7 +28,6 @@ rtcontrib - compute contribution coeffic + { + .B "\-m mod | \-M file" + } +-.. + [ + .B $EVAR + ] --- radiance-4R0+20100729.orig/debian/patches/rename-genbox-man +++ radiance-4R0+20100729/debian/patches/rename-genbox-man @@ -0,0 +1,194 @@ +## rename-genbox-man.dpatch by Bernd Zeimetz +## +## DP: rename genbox in manpages. + +@DPATCH@ +--- a/doc/man/cat1/genblinds.1 ++++ b/doc/man/cat1/genblinds.1 +@@ -39,7 +39,7 @@ AAUUTTHHOORR + Jean-Louis Scartezzini and Greg Ward + + SSEEEE AALLSSOO +- genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), ++ genrbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), + xform(1) + + +--- a/doc/man/cat1/genbox.1 ++++ b/doc/man/cat1/genbox.1 +@@ -3,7 +3,7 @@ GENBOX(1) + + + NNAAMMEE +- genbox - generate a RADIANCE description of a box ++ genrbox - generate a RADIANCE description of a box + + SSYYNNOOPPSSIISS + ggeennbbooxx mmaatt nnaammee xxssiizz yyssiizz zzssiizz [ --ii ][ --rr rraadd | --bb bbeevv ] +@@ -21,7 +21,7 @@ DDEESSCCRRIIPPTTIIOONN + EEXXAAMMPPLLEE + To produce a rectangular box made of wood with beveled edges: + +- genbox wood box1 5 8 3 -b .5 > box1 ++ genrbox wood box1 5 8 3 -b .5 > box1 + + AAUUTTHHOORR + Greg Ward +--- a/doc/man/cat1/genclock.1 ++++ b/doc/man/cat1/genclock.1 +@@ -37,7 +37,7 @@ AAUUTTHHOORR + Greg Ward + + SSEEEE AALLSSOO +- genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), ++ genrbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), + xform(1) + + +--- a/doc/man/cat1/genprism.1 ++++ b/doc/man/cat1/genprism.1 +@@ -35,7 +35,7 @@ BBUUGGSS + normals. If the normals face inward, the appearance will be bizarre. + + SSEEEE AALLSSOO +- genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), ++ genrbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), + xform(1) + + +--- a/doc/man/cat1/genrev.1 ++++ b/doc/man/cat1/genrev.1 +@@ -33,7 +33,7 @@ BBUUGGSS + site side. + + SSEEEE AALLSSOO +- genbox(1), gensurf(1), genworm(1), icalc(1), rpict(1), rvu(1), xform(1) ++ genrbox(1), gensurf(1), genworm(1), icalc(1), rpict(1), rvu(1), xform(1) + + + +--- a/doc/man/cat1/gensurf.1 ++++ b/doc/man/cat1/gensurf.1 +@@ -68,7 +68,7 @@ BBUUGGSS + [0,1] boundaries of s and t. + + SSEEEE AALLSSOO +- genbox(1), genrev(1), genworm(1), icalc(1), obj2mesh(1), obj2rad(1), ++ genrbox(1), genrev(1), genworm(1), icalc(1), obj2mesh(1), obj2rad(1), + rpict(1), rvu(1), xform(1) + + +--- a/doc/man/cat1/genworm.1 ++++ b/doc/man/cat1/genworm.1 +@@ -31,7 +31,7 @@ BBUUGGSS + back inside itself without making a mess. + + SSEEEE AALLSSOO +- genbox(1), genrev(1), gensurf(1), icalc(1), rpict(1), rvu(1), xform(1) ++ genrbox(1), genrev(1), gensurf(1), icalc(1), rpict(1), rvu(1), xform(1) + + + +--- a/doc/man/cat1/xform.1 ++++ b/doc/man/cat1/xform.1 +@@ -111,7 +111,7 @@ BBUUGGSS + Only regular (distortion-free) transformations are allowed. + + SSEEEE AALLSSOO +- genbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), rvu(1) ++ genrbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), rvu(1) + + + +--- a/doc/man/man1/genblinds.1 ++++ b/doc/man/man1/genblinds.1 +@@ -57,4 +57,4 @@ genblinds white blind 1 46 88 25 15 \-r + .SH AUTHOR + Jean-Louis Scartezzini and Greg Ward + .SH "SEE ALSO" +-genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), xform(1) ++genrbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), xform(1) +--- a/doc/man/man1/genbox.1 ++++ b/doc/man/man1/genbox.1 +@@ -1,9 +1,9 @@ +-.\" RCSid "$Id: genbox.1,v 1.4 2007/09/04 17:36:40 greg Exp $" ++.\" RCSid "$Id: genrbox.1,v 1.4 2007/09/04 17:36:40 greg Exp $" + .TH GENBOX 1 11/15/93 RADIANCE + .SH NAME +-genbox - generate a RADIANCE description of a box ++genrbox - generate a RADIANCE description of a box + .SH SYNOPSIS +-.B "genbox mat name xsiz ysiz zsiz" ++.B "genrbox mat name xsiz ysiz zsiz" + [ + .B \-i + ][ +@@ -35,7 +35,7 @@ option can be used to specify the indent + .SH EXAMPLE + To produce a rectangular box made of wood with beveled edges: + .IP "" .2i +-genbox wood box1 5 8 3 \-b .5 > box1 ++genrbox wood box1 5 8 3 \-b .5 > box1 + .SH AUTHOR + Greg Ward + .SH BUGS +--- a/doc/man/man1/genclock.1 ++++ b/doc/man/man1/genclock.1 +@@ -54,4 +54,4 @@ genclock 10:35 | xform \-s 6 \-rz 90 \-t + .SH AUTHOR + Greg Ward + .SH "SEE ALSO" +-genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), xform(1) ++genrbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), xform(1) +--- a/doc/man/man1/genprism.1 ++++ b/doc/man/man1/genprism.1 +@@ -57,4 +57,4 @@ The rounding option only works for opaqu + normals. + If the normals face inward, the appearance will be bizarre. + .SH "SEE ALSO" +-genbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), xform(1) ++genrbox(1), genrev(1), gensurf(1), genworm(1), rpict(1), rvu(1), xform(1) +--- a/doc/man/man1/genrev.1 ++++ b/doc/man/man1/genrev.1 +@@ -57,4 +57,4 @@ Greg Ward + The \-s option doesn't modify the surface normal correctly + for the opposite side. + .SH "SEE ALSO" +-genbox(1), gensurf(1), genworm(1), icalc(1), rpict(1), rvu(1), xform(1) ++genrbox(1), gensurf(1), genworm(1), icalc(1), rpict(1), rvu(1), xform(1) +--- a/doc/man/man1/gensurf.1 ++++ b/doc/man/man1/gensurf.1 +@@ -115,5 +115,5 @@ Greg Ward + The smoothing operation requires that functions be defined + beyond the [0,1] boundaries of s and t. + .SH "SEE ALSO" +-genbox(1), genrev(1), genworm(1), icalc(1), ++genrbox(1), genrev(1), genworm(1), icalc(1), + obj2mesh(1), obj2rad(1), rpict(1), rvu(1), xform(1) +--- a/doc/man/man1/genworm.1 ++++ b/doc/man/man1/genworm.1 +@@ -46,4 +46,4 @@ Since the worm is constructed of interse + opaque materials should be used with this object. + Also, a worm cannot double back inside itself without making a mess. + .SH "SEE ALSO" +-genbox(1), genrev(1), gensurf(1), icalc(1), rpict(1), rvu(1), xform(1) ++genrbox(1), genrev(1), gensurf(1), icalc(1), rpict(1), rvu(1), xform(1) +--- a/doc/man/man1/xform.1 ++++ b/doc/man/man1/xform.1 +@@ -184,4 +184,4 @@ Greg Ward + .SH BUGS + Only regular (distortion-free) transformations are allowed. + .SH "SEE ALSO" +-genbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), rvu(1) ++genrbox(1), gensurf(1), oconv(1), replmarks(1), rpict(1), rvu(1) +--- a/doc/man/whatis ++++ b/doc/man/whatis +@@ -12,7 +12,7 @@ fieldcomb(1) - combine two or more field + findglare(1) - locate glare sources in a RADIANCE scene + gcomp(1) - do computations on a graph file. + genblinds(1) - generate a RADIANCE description of venetian blinds +-genbox(1) - generate a RADIANCE description of a box ++genrbox(1) - generate a RADIANCE description of a box + genclock(1) - generate a RADIANCE description of a clock + gendaylit(1) - generates a RADIANCE description of the daylit sources using Perez models for diffuse and direct components + genklemsamp(1) - generate ray samples over surfaces using Klems BSDF basis --- radiance-4R0+20100729.orig/debian/patches/fix-hardcoded-raypaths +++ radiance-4R0+20100729/debian/patches/fix-hardcoded-raypaths @@ -0,0 +1,205 @@ +## fix-hardcoded-raypaths.dpatch by Bernd Zeimetz +## +## DP: grep -lr '/usr/local/lib/ray' * | grep -v Rmakefile | xargs sed -i 's,/usr/local/lib/ray,/usr/share/radiance,g' +## DP: We don't install to /usr/local, fixing the locations where possible + +@DPATCH@ +--- a/README ++++ b/README +@@ -67,7 +67,7 @@ distribution). As you develop auxiliary + useful to add in your own library directory before the system directory. + An example setting such as this would go in a user's .login file: + +- setenv RAYPATH .:${HOME}/mylib:/usr/local/lib/ray ++ setenv RAYPATH .:${HOME}/mylib:/usr/share/radiance + + After installing the software, you may want to start by scanning the + troff input documentation contained in "doc/ray.1", which is also formatted +--- a/doc/man/cat1/arch2rad.1 ++++ b/doc/man/cat1/arch2rad.1 +@@ -63,10 +63,10 @@ DDEESSCCRRIIPPTTIIOONN + + + If neither the _-_m nor the _-_n options are not used, _a_r_c_h_2_r_a_d uses the +- default mapping file "/usr/local/lib/ray/lib/arch.map". This file sim- ++ default mapping file "/usr/share/radiance/lib/arch.map". This file sim- + ply assigns materials based on color, using the identifiers "c0" + through "c255". Appropriate materials for these identifiers are con- +- tained in "/usr/local/lib/ray/lib/arch.mat". ++ tained in "/usr/share/radiance/lib/arch.mat". + + The _-_n option may be used to produce a list of qualifiers from which to + construct a mapping for the given Architrion file. If the _-_m option is +@@ -121,11 +121,11 @@ EEXXAAMMPPLLEE + To create an octree directly from an Architrion file using the default + mapping and materials: + +- oconv source.rad /usr/local/lib/ray/lib/arch.mat '\!arch2rad build- ++ oconv source.rad /usr/share/radiance/lib/arch.mat '\!arch2rad build- + ing.txt' > building.oct + + FFIILLEESS +- /usr/local/lib/ray/lib/arch.map /usr/local/lib/ray/lib/arch.mat ++ /usr/share/radiance/lib/arch.map /usr/share/radiance/lib/arch.mat + + AAUUTTHHOORR + Greg Ward +--- a/doc/man/cat1/gensky.1 ++++ b/doc/man/cat1/gensky.1 +@@ -151,7 +151,7 @@ EEXXAAMMPPLLEE + gensky -ang 23 -40 -s + + FFIILLEESS +- /usr/local/lib/ray/skybright.cal ++ /usr/share/radiance/skybright.cal + + AAUUTTHHOORR + Greg Ward +--- a/doc/man/cat1/ies2rad.1 ++++ b/doc/man/cat1/ies2rad.1 +@@ -130,9 +130,9 @@ EEXXAAMMPPLLEE + ies2rad -di -t default -m .85 fluor01.ies + + To convert three IES files of various types to tenths of a foot and put +- them in the library "/usr/local/lib/ray" subdirectory "source/ies": ++ them in the library "/usr/share/radiance" subdirectory "source/ies": + +- ies2rad -df/10 -l /usr/local/lib/ray -p source/ies ies01 ies02 ies03 ++ ies2rad -df/10 -l /usr/share/radiance -p source/ies ies01 ies02 ies03 + + To convert a single file and give the output a different name: + +--- a/doc/man/man1/arch2rad.1 ++++ b/doc/man/man1/arch2rad.1 +@@ -94,11 +94,11 @@ nor the + .I \-n + options are not used, + .I arch2rad +-uses the default mapping file "/usr/local/lib/ray/lib/arch.map". ++uses the default mapping file "/usr/share/radiance/lib/arch.map". + This file simply assigns materials based on color, using the + identifiers "c0" through "c255". + Appropriate materials for these identifiers are contained +-in "/usr/local/lib/ray/lib/arch.mat". ++in "/usr/share/radiance/lib/arch.mat". + .PP + The + .I \-n +@@ -162,10 +162,10 @@ arch2rad \-m building.map building.txt > + To create an octree directly from an Architrion file using the default + mapping and materials: + .IP "" .2i +-oconv source.rad /usr/local/lib/ray/lib/arch.mat '\\!arch2rad building.txt' > building.oct ++oconv source.rad /usr/share/radiance/lib/arch.mat '\\!arch2rad building.txt' > building.oct + .SH FILES +-/usr/local/lib/ray/lib/arch.map +-/usr/local/lib/ray/lib/arch.mat ++/usr/share/radiance/lib/arch.map ++/usr/share/radiance/lib/arch.mat + .SH AUTHOR + Greg Ward + .SH "SEE ALSO" +--- a/doc/man/man1/gensky.1 ++++ b/doc/man/man1/gensky.1 +@@ -223,7 +223,7 @@ without the sun description: + .IP "" .2i + gensky \-ang 23 \-40 \-s + .SH FILES +-/usr/local/lib/ray/skybright.cal ++/usr/share/radiance/skybright.cal + .SH AUTHOR + Greg Ward + .SH "SEE ALSO" +--- a/doc/man/man1/ies2rad.1 ++++ b/doc/man/man1/ies2rad.1 +@@ -181,9 +181,9 @@ creating the files "fluor01.rad" and "fl + ies2rad \-di \-t default \-m .85 fluor01.ies + .PP + To convert three IES files of various types to tenths of a foot and put +-them in the library "/usr/local/lib/ray" subdirectory "source/ies": ++them in the library "/usr/share/radiance" subdirectory "source/ies": + .IP "" .2i +-ies2rad \-df/10 \-l /usr/local/lib/ray \-p source/ies ies01 ies02 ies03 ++ies2rad \-df/10 \-l /usr/share/radiance \-p source/ies ies01 ies02 ies03 + .PP + To convert a single file and give the output a different name: + .IP "" .2i +--- a/doc/notes/translators ++++ b/doc/notes/translators +@@ -114,12 +114,12 @@ based on some set of default paramters. + color alone to assign materials "c0" through "c255".) To accompany the + default mapping, there should be a default materials file with + corresponding definitions. These files should be placed in the +-Radiance library directory under "lib" (ie. "/usr/local/lib/ray/lib"). ++Radiance library directory under "lib" (ie. "/usr/share/radiance/lib"). + + To just look at an Architrion building, a user might issue the following + commands: + +- oconv '\!gensky 6 15 12' /usr/local/lib/ray/lib/arch.mat \ ++ oconv '\!gensky 6 15 12' /usr/share/radiance/lib/arch.mat \ + '\!arch2rad model.txt' > model.oct + rvu -av 3 3 3 -vp -20 -20 5 -vd 1 1 0 model.oct + +--- a/installib ++++ b/installib +@@ -4,13 +4,13 @@ + # Install library files + # + again2: +-echo -n "Where do you want the library files [/usr/local/lib/ray]? " ++echo -n "Where do you want the library files [/usr/share/radiance]? " + set ldir=$< + (echo $ldir) >/dev/null + if ( $status ) goto again2 + set ldir=$ldir + if ( "$ldir" == "" ) then +- set ldir=/usr/local/lib/ray ++ set ldir=/usr/share/radiance + else if ( "$ldir" !~ /* ) then + echo "Directory must be relative to root, please reenter" + goto again2 +--- a/src/common/paths.h ++++ b/src/common/paths.h +@@ -102,7 +102,7 @@ + #define TEMPLEN 17 + #define ULIBVAR "RAYPATH" + #ifndef DEFPATH +- #define DEFPATH ":/usr/local/lib/ray" ++ #define DEFPATH ":/usr/share/radiance" + #endif + #define fixargv0(a0) (a0) + +--- a/src/cv/arch2rad.c ++++ b/src/cv/arch2rad.c +@@ -14,7 +14,7 @@ static const char RCSid[] = "$Id: arch2r + #include "rtio.h" + #include "trans.h" + +-#define DEFMAPFILE "/usr/local/lib/ray/lib/arch.map" ++#define DEFMAPFILE "/usr/share/radiance/lib/arch.map" + + /* qualifiers */ + #define Q_COL 0 +--- a/src/util/debugcal.csh ++++ b/src/util/debugcal.csh +@@ -13,7 +13,7 @@ if ( $#argv < 2 ) then + exit 1 + endif + if ( ! $?RAYPATH ) then +- set RAYPATH=.:/usr/local/lib/ray ++ set RAYPATH=.:/usr/share/radiance + endif + set initfile= + foreach d (`echo $RAYPATH | sed 's/:/ /g'`) +--- a/src/util/trad.wsh ++++ b/src/util/trad.wsh +@@ -6,7 +6,7 @@ + + # Insert our autoload directory (may require local system modification) + +-set radlib /usr/local/lib/ray/tcl ++set radlib /usr/share/radiance/tcl + set helplib $radlib + + set auto_path [linsert $auto_path 0 $radlib] --- radiance-4R0+20100729.orig/debian/patches/series +++ radiance-4R0+20100729/debian/patches/series @@ -0,0 +1,10 @@ +use-system-libtiff +cal-Rmakefile-missing-deps +librtrad-location +rename-genbox-src +no-rview-please +rename-genbox-obj +rename-genbox-lib +rename-genbox-man +fix-hardcoded-raypaths +manpage-fixes --- radiance-4R0+20100729.orig/debian/patches/rename-genbox-obj +++ radiance-4R0+20100729/debian/patches/rename-genbox-obj @@ -0,0 +1,797 @@ +## rename-genbox-obj.dpatch by Bernd Zeimetz +## +## DP: rename genbox in obj + +@DPATCH@ +--- a/obj/cabin/bathroom ++++ b/obj/cabin/bathroom +@@ -1385,7 +1385,7 @@ bathfauc_mat ring bath.drain + # Window + # + # xform -t 13.5 -4.75 37.75 +-# genbox wframe_mat wframe.lower 33.5 5.75 2.25 ++# genrbox wframe_mat wframe.lower 33.5 5.75 2.25 + + wframe_mat polygon bath.wframe.lower.1540 + 0 +@@ -1441,7 +1441,7 @@ wframe_mat polygon bath.wframe.lower.645 + -0.38083 14.12284 3.3012 + 0.09228 14.12284 3.3012 + # xform -t 44.5 -4.75 37.75 +-# genbox wframe_mat wframe.north 2.25 5.75 44.5 ++# genrbox wframe_mat wframe.north 2.25 5.75 44.5 + + wframe_mat polygon bath.wframe.north.1540 + 0 +@@ -1497,7 +1497,7 @@ wframe_mat polygon bath.wframe.north.645 + -0.38083 14.14341 6.77753 + 0.09228 14.14341 6.77753 + # xform -t 13.5 -4.75 80 +-# genbox wframe_mat wframe.upper 33.5 5.75 2.25 ++# genrbox wframe_mat wframe.upper 33.5 5.75 2.25 + + wframe_mat polygon bath.wframe.upper.1540 + 0 +@@ -1553,7 +1553,7 @@ wframe_mat polygon bath.wframe.upper.645 + -0.38083 14.12284 6.77753 + 0.09228 14.12284 6.77753 + # xform -t 13.5 -4.75 37.75 +-# genbox wframe_mat wframe.south 2.25 5.75 44.5 ++# genrbox wframe_mat wframe.south 2.25 5.75 44.5 + + wframe_mat polygon bath.wframe.south.1540 + 0 +@@ -1869,7 +1869,7 @@ window_mat polygon bath.window.22 + + # xform -e -n bath -rz -160 -s .08333 -t 8.34 17.2 0 + # xform -t .5 0 1 +-# genbox blue_enamel door 27 1.375 78 ++# genrbox blue_enamel door 27 1.375 78 + + blue_enamel polygon bath.door.1540 + 0 +@@ -1972,7 +1972,7 @@ brass ring bath.outer_knobplate + # Door Frame + # + # xform -t 6.75 99.5 80.25 +-# genbox dframe_mat dframe.upper 32.5 6.75 2.25 -r .25 ++# genrbox dframe_mat dframe.upper 32.5 6.75 2.25 -r .25 + + dframe_mat polygon bath.dframe.upper.dhgc + 0 +@@ -2164,7 +2164,7 @@ dframe_mat sphere bath.dframe.upper.o + 0 + 4 8.73168 14.78108 6.77753 0.02057 + # xform -t 6.75 99.5 0 +-# genbox dframe_mat dframe.south 2.25 6.75 82.5 -r .25 ++# genrbox dframe_mat dframe.south 2.25 6.75 82.5 -r .25 + + dframe_mat polygon bath.dframe.south.dhgc + 0 +@@ -2356,7 +2356,7 @@ dframe_mat sphere bath.dframe.south.o + 0 + 4 8.73168 17.27005 6.77753 0.02057 + # xform -t 37 99.5 0 +-# genbox dframe_mat dframe.north 2.25 6.75 82.5 -r .25 ++# genrbox dframe_mat dframe.north 2.25 6.75 82.5 -r .25 + + dframe_mat polygon bath.dframe.north.dhgc + 0 +@@ -4341,7 +4341,7 @@ marble polygon bath.vanity.sink.92 + 4.46921033945 17.035552 2.12384564754 + # edit the following: + # xform -t 0 0 30 +-# genbox marble sink 31 22 .75 ++# genrbox marble sink 31 22 .75 + + marble polygon bath.vanity.sink.1540 + 0 +@@ -4394,7 +4394,7 @@ marble polygon bath.vanity.sink.5137 + 5.572128 17.981772 2.4784 + 5.572128 17.981772 2.54011 + # xform -t 0 21.25 30.76 +-# genbox marble sink_back 31 .75 3 ++# genrbox marble sink_back 31 .75 3 + + marble polygon bath.vanity.sink_back.1540 + 0 +@@ -4650,7 +4650,7 @@ zwood polygon bath.vanity.cab_right.8 + 5.489848 16.583012 0.01 + 5.530988 16.583012 0.01 + # xform -t .5 4.5 0 +-# genbox xwood cab_base 30 .5 4 ++# genrbox xwood cab_base 30 .5 4 + + ywood polygon bath.vanity.cab_base.1540 + 0 +@@ -4706,7 +4706,7 @@ ywood polygon bath.vanity.cab_base.6457 + 5.530988 16.541872 0.33912 + 5.530988 16.583012 0.33912 + # xform -t .5 3.5 4 +-# genbox zwood cab_front 30 .5 20.5 -r .1 ++# genrbox zwood cab_front 30 .5 20.5 -r .1 + + zwood polygon bath.vanity.cab_front.dhgc + 0 +@@ -4898,7 +4898,7 @@ zwood sphere bath.vanity.cab_front.o + 0 + 4 5.52276 16.492504 2.017632 0.008228 + # xform -t 0 -.5 0 -rx 15.25 -t .5 3 24.5 +-# genbox xwood cab_front_top 30 .5 5.75 -r .1 ++# genrbox xwood cab_front_top 30 .5 5.75 -r .1 + + ywood polygon bath.vanity.cab_front_top.dhgc + 0 +@@ -5090,7 +5090,7 @@ ywood sphere bath.vanity.cab_front_top.o + 0 + 4 5.52276 16.2882352529 2.47220803984 0.008228 + # xform -t 2 2.95 5 +-# genbox zwood cab_door 13.5 .5 18.5 -r .1 ++# genrbox zwood cab_door 13.5 .5 18.5 -r .1 + + zwood polygon bath.vanity.cab_door.dhgc + 0 +@@ -5282,7 +5282,7 @@ zwood sphere bath.vanity.cab_door.o + 0 + 4 4.28856 16.44725 1.935352 0.008228 + # xform -t 18 2.95 5 +-# genbox xwood cab_drawer_lower 11 .5 5.75 -r .1 ++# genrbox xwood cab_drawer_lower 11 .5 5.75 -r .1 + + ywood polygon bath.vanity.cab_drawer_lower.dhgc + 0 +@@ -5474,7 +5474,7 @@ ywood sphere bath.vanity.cab_drawer_lowe + 0 + 4 5.39934 16.44725 0.886282 0.008228 + # xform -t 18 2.95 11.25 +-# genbox xwood cab_drawer_middle 11 .5 5.75 -r .1 ++# genrbox xwood cab_drawer_middle 11 .5 5.75 -r .1 + + ywood polygon bath.vanity.cab_drawer_middle.dhgc + 0 +@@ -5666,7 +5666,7 @@ ywood sphere bath.vanity.cab_drawer_midd + 0 + 4 5.39934 16.44725 1.400532 0.008228 + # xform -t 18 2.95 17.75 +-# genbox xwood cab_drawer_top 11 .5 5.75 -r .1 ++# genrbox xwood cab_drawer_top 11 .5 5.75 -r .1 + + ywood polygon bath.vanity.cab_drawer_top.dhgc + 0 +@@ -5861,7 +5861,7 @@ ywood sphere bath.vanity.cab_drawer_top. + # + # A mirrored wooden medicine cabinet. + # +-# genbox zwood cabinet 4 46.5 27.5 ++# genrbox zwood cabinet 4 46.5 27.5 + + zwood polygon bath.mirror.cabinet.1540 + 0 +@@ -6301,7 +6301,7 @@ ywood cylinder bath.mirror.upper_right_f + 4.78224 17.595056 5.944445 + 0.010285 + # xform -t 4 15.625 -.875 +-# genbox ywood lower_middle_frame .875 15.25 1.75 ++# genrbox ywood lower_middle_frame .875 15.25 1.75 + + ywood polygon bath.mirror.lower_middle_frame.1540 + 0 +@@ -6365,7 +6365,7 @@ ywood cylinder bath.mirror.lower_middle_ + 4.771955 17.595056 3.825735 + 0.010285 + # xform -t 4 15.625 26.625 +-# genbox ywood upper_middle_frame .875 15.25 1.75 ++# genrbox ywood upper_middle_frame .875 15.25 1.75 + + ywood polygon bath.mirror.upper_middle_frame.1540 + 0 +@@ -6437,7 +6437,7 @@ ywood cylinder bath.mirror.upper_middle_ + # A humble throne + # + # xform -t 7 5.5 0 +-# genbox toilet_mat base0 15 9 1 -r .2 ++# genrbox toilet_mat base0 15 9 1 -r .2 + + toilet_mat polygon bath.toilet.base0.dhgc + 0 +@@ -6718,7 +6718,7 @@ toilet_mat polygon bath.toilet.base1.7 + 1.30591 17.054065 0.05114 + 1.71731 17.054065 0.05114 + # xform -t 0 5.75 13 +-# genbox toilet_mat base2 11 8.5 2 -r .2 ++# genrbox toilet_mat base2 11 8.5 2 -r .2 + + toilet_mat polygon bath.toilet.base2.dhgc + 0 +--- a/obj/cabin/bdfurn.rad ++++ b/obj/cabin/bdfurn.rad +@@ -10,9 +10,9 @@ + # The Cabin's Bed. + # + +-!genbox rose_spread bed 6 4.5 1.733 -r .2 | xform -t .08333 1.5 .1 ++!genrbox rose_spread bed 6 4.5 1.733 -r .2 | xform -t .08333 1.5 .1 + +-!genbox rose_spread pillows 1.333 4.5 .5 -r .2 | xform -t .08333 1.5 1.833 ++!genrbox rose_spread pillows 1.333 4.5 .5 -r .2 | xform -t .08333 1.5 1.833 + + + +--- a/obj/cabin/cabin ++++ b/obj/cabin/cabin +@@ -8,12 +8,12 @@ + + # Cabin Foundation + +-!genbox concrete foundation 27.8 18.8 3 | xform -t -.4 -.4 -3.0001 ++!genrbox concrete foundation 27.8 18.8 3 | xform -t -.4 -.4 -3.0001 + + + # Cabin Porch + +-!genbox xybrick porch 6 3 3 | xform -t 18 18.5 -3.3 ++!genrbox xybrick porch 6 3 3 | xform -t 18 18.5 -3.3 + + + # Cabin Floor +@@ -54,7 +54,7 @@ wood_floor polygon floor + # The Chimney + + # xform -t 26.25 5.5 -3 +-# genbox fireplace_stone chimney 2 3 22 ++# genrbox fireplace_stone chimney 2 3 22 + + xzbrick polygon south.chimney + 0 +@@ -121,7 +121,7 @@ yxbrick polygon top.chimney + + + # xform -t 26.25 6 1.25 +-# genbox cinderblock fireplace 1.5 2 1.5 -i ++# genrbox cinderblock fireplace 1.5 2 1.5 -i + + cinderblock polygon fireplace.1540 + 0 +@@ -321,7 +321,7 @@ cinderblock polygon chimney_stack.13 + # Hearth + + # xform -t 25 4 0 +-# genbox fireplace_stone hearth 2 6 1.25 ++# genrbox fireplace_stone hearth 2 6 1.25 + + xzbrick polygon hearth.south + 0 +@@ -417,9 +417,9 @@ wood_panel polygon nbed_wall + # Bedroom Closet + + # xform -t 6 11 0 +-# genbox wood_panel closet 5 2.75 6.5 -i ++# genrbox wood_panel closet 5 2.75 6.5 -i + +-# The opening to the closet created by genbox is commented out here, ++# The opening to the closet created by genrbox is commented out here, + # to provide a closet door opening to the closet. + #wood_panel polygon closet.1540 + #0 +@@ -489,7 +489,7 @@ light_wood cylinder closet_dowel + + # Closet Shelf + +-!genbox light_wood closet_shelf 5 1.5 .08333 | xform -t 6 12.25 5.33 ++!genrbox light_wood closet_shelf 5 1.5 .08333 | xform -t 6 12.25 5.33 + + # Interior Livingroom Wall + +--- a/obj/cabin/chair.norm ++++ b/obj/cabin/chair.norm +@@ -5,12 +5,12 @@ + # (to the sitter's left, and back). + # + +-!genbox brown_tweed back 30 5 33 -r 1 ++!genrbox brown_tweed back 30 5 33 -r 1 + +-!genbox brown_tweed left_arm 5 17 25 -r 1 | xform -t 0 5 0 ++!genrbox brown_tweed left_arm 5 17 25 -r 1 | xform -t 0 5 0 + +-!genbox brown_tweed right_arm 5 17 25 -r 1 | xform -t 25 5 0 ++!genrbox brown_tweed right_arm 5 17 25 -r 1 | xform -t 25 5 0 + +-!genbox brown_tweed base 20 17 12 -r 1 | xform -t 5 5 0 ++!genrbox brown_tweed base 20 17 12 -r 1 | xform -t 5 5 0 + +-!genbox brown_tweed cushion 20 17 5 -r 1 | xform -t 5 5 12 ++!genrbox brown_tweed cushion 20 17 5 -r 1 | xform -t 5 5 12 +--- a/obj/cabin/door.norm ++++ b/obj/cabin/door.norm +@@ -6,7 +6,7 @@ + # The materials door_paint & brass need to be defined. + # + +-!genbox door_paint door 35 1.375 76 | xform -t .5 0 1 ++!genrbox door_paint door 35 1.375 76 | xform -t .5 0 1 + + brass sphere inner_doorknob + 0 +--- a/obj/cabin/dresser.norm ++++ b/obj/cabin/dresser.norm +@@ -108,7 +108,7 @@ xpine polygon cabinet.top + 30 20 34 + + +-!genbox zpine mirror_back 30 1 36 -r .25 | xform -t 0 0 34 ++!genrbox zpine mirror_back 30 1 36 -r .25 | xform -t 0 0 34 + + # mirror polygon dresser_mirror + # 0 +@@ -126,7 +126,7 @@ xpine polygon cabinet.top + # The three dresser drawers. + # xform -n drawer.0 -t 1 20 2.5 -i 0 -t 0 0 10.5 + +-!genbox xpine drawer_front 28 .75 10 -r .25 | xform -e -n drawer.0 -t 1 20 2.5 -i 0 -t 0 0 10.5 ++!genrbox xpine drawer_front 28 .75 10 -r .25 | xform -e -n drawer.0 -t 1 20 2.5 -i 0 -t 0 0 10.5 + # xform -n handle.0 -t 4 .75 5 -i 0 -t 15 0 0 + + brass cylinder drawer.0.handle.0.right_stem +@@ -189,7 +189,7 @@ brass cylinder drawer.0.handle.1.left_st + 0.25 + # xform -n drawer.1 -t 1 20 2.5 -i 1 -t 0 0 10.5 + +-!genbox xpine drawer_front 28 .75 10 -r .25 | xform -e -n drawer.1 -t 1 20 2.5 -i 1 -t 0 0 10.5 ++!genrbox xpine drawer_front 28 .75 10 -r .25 | xform -e -n drawer.1 -t 1 20 2.5 -i 1 -t 0 0 10.5 + # xform -n handle.0 -t 4 .75 5 -i 0 -t 15 0 0 + + brass cylinder drawer.1.handle.0.right_stem +@@ -252,7 +252,7 @@ brass cylinder drawer.1.handle.1.left_st + 0.25 + # xform -n drawer.2 -t 1 20 2.5 -i 2 -t 0 0 10.5 + +-!genbox xpine drawer_front 28 .75 10 -r .25 | xform -e -n drawer.2 -t 1 20 2.5 -i 2 -t 0 0 10.5 ++!genrbox xpine drawer_front 28 .75 10 -r .25 | xform -e -n drawer.2 -t 1 20 2.5 -i 2 -t 0 0 10.5 + # xform -n handle.0 -t 4 .75 5 -i 0 -t 15 0 0 + + brass cylinder drawer.2.handle.0.right_stem +--- a/obj/cabin/furniture ++++ b/obj/cabin/furniture +@@ -16,24 +16,24 @@ + # The Cabin's Bed. + # + +-!genbox rose_spread bed 6 4.5 1.733 -r .2 | xform -t .08333 1.5 .1 ++!genrbox rose_spread bed 6 4.5 1.733 -r .2 | xform -t .08333 1.5 .1 + +-!genbox rose_spread pillows 1.333 4.5 .5 -r .2 | xform -t .08333 1.5 1.833 ++!genrbox rose_spread pillows 1.333 4.5 .5 -r .2 | xform -t .08333 1.5 1.833 + + + # + # The Table. + # + +-!genbox ypine tabletop 2 2 .1667 | xform -t 15 1 2 ++!genrbox ypine tabletop 2 2 .1667 | xform -t 15 1 2 + +-!genbox zpine leg1 .1667 .1667 2 | xform -t 15 1 0 ++!genrbox zpine leg1 .1667 .1667 2 | xform -t 15 1 0 + +-!genbox zpine leg2 .1667 .1667 2 | xform -t 15 2.8333 0 ++!genrbox zpine leg2 .1667 .1667 2 | xform -t 15 2.8333 0 + +-!genbox zpine leg3 .1667 .1667 2 | xform -t 16.8333 2.8333 0 ++!genrbox zpine leg3 .1667 .1667 2 | xform -t 16.8333 2.8333 0 + +-!genbox zpine leg4 .1667 .1667 2 | xform -t 16.8333 1 0 ++!genrbox zpine leg4 .1667 .1667 2 | xform -t 16.8333 1 0 + + + # The Dresser in Bedroom +--- a/obj/cabin/lvfurn.rad ++++ b/obj/cabin/lvfurn.rad +@@ -14,15 +14,15 @@ + # The Table. + # + +-!genbox ypine tabletop 2 2 .1667 | xform -t 15 1 2 ++!genrbox ypine tabletop 2 2 .1667 | xform -t 15 1 2 + +-!genbox zpine leg1 .1667 .1667 2 | xform -t 15 1 0 ++!genrbox zpine leg1 .1667 .1667 2 | xform -t 15 1 0 + +-!genbox zpine leg2 .1667 .1667 2 | xform -t 15 2.8333 0 ++!genrbox zpine leg2 .1667 .1667 2 | xform -t 15 2.8333 0 + +-!genbox zpine leg3 .1667 .1667 2 | xform -t 16.8333 2.8333 0 ++!genrbox zpine leg3 .1667 .1667 2 | xform -t 16.8333 2.8333 0 + +-!genbox zpine leg4 .1667 .1667 2 | xform -t 16.8333 1 0 ++!genrbox zpine leg4 .1667 .1667 2 | xform -t 16.8333 1 0 + + + # The Coatrack in Livingroom +--- a/obj/cabin/sofa.norm ++++ b/obj/cabin/sofa.norm +@@ -4,17 +4,17 @@ + # The scale is in inches. + # + +-!genbox brown_tweed back 60 5 33 -r 1 | xform -t 5 0 0 ++!genrbox brown_tweed back 60 5 33 -r 1 | xform -t 5 0 0 + +-!genbox brown_tweed left_arm 5 22 25 -r 1 ++!genrbox brown_tweed left_arm 5 22 25 -r 1 + +-!genbox brown_tweed right_arm 5 22 25 -r 1 | xform -t 65 0 0 ++!genrbox brown_tweed right_arm 5 22 25 -r 1 | xform -t 65 0 0 + +-!genbox brown_tweed base 60 17 12 -r 1 | xform -t 5 5 0 ++!genrbox brown_tweed base 60 17 12 -r 1 | xform -t 5 5 0 + +-!genbox brown_tweed left_cushion 20 17 5 -r 1 | xform -t 5 5 12 ++!genrbox brown_tweed left_cushion 20 17 5 -r 1 | xform -t 5 5 12 + +-!genbox brown_tweed middle_cushion 20 17 5 -r 1 | xform -t 25 5 12 ++!genrbox brown_tweed middle_cushion 20 17 5 -r 1 | xform -t 25 5 12 + +-!genbox brown_tweed right_cushion 20 17 5 -r 1 | xform -t 45 5 12 ++!genrbox brown_tweed right_cushion 20 17 5 -r 1 | xform -t 45 5 12 + +--- a/obj/misc/examp ++++ b/obj/misc/examp +@@ -7,7 +7,7 @@ void plastic sky_blue + 0 + 5 .6 .6 .7 0 0 + +-!genbox sky_blue room 10 5 8 -i ++!genrbox sky_blue room 10 5 8 -i + + void metal gold + 0 +--- a/obj/office/book.norm ++++ b/obj/office/book.norm +@@ -3,11 +3,11 @@ + # The cover material must be defined as cover_mat + # + +-!genbox cover_mat back_cover 6.5 .125 9.5 ++!genrbox cover_mat back_cover 6.5 .125 9.5 + +-!genbox cover_mat front_cover 6.5 .125 9.5 | xform -t 0 1.25 0 ++!genrbox cover_mat front_cover 6.5 .125 9.5 | xform -t 0 1.25 0 + +-!genbox cover_mat bind_cover .125 1.125 9.5 | xform -t -.125 .125 0 ++!genrbox cover_mat bind_cover .125 1.125 9.5 | xform -t -.125 .125 0 + + void plastic page_mat + 0 +--- a/obj/office/chair2.norm ++++ b/obj/office/chair2.norm +@@ -2,10 +2,10 @@ + # A straight chair + # + +-!genbox leg_material leg.right.rear .75 26 1.5 +-!genbox leg_material leg.left.rear .75 26 1.5 | xform -t 24 0 0 +-!genbox leg_material leg.right.front .75 26 1.5 | xform -t 0 0 20 +-!genbox leg_material leg.left.front .75 26 1.5 | xform -t 24 0 20 ++!genrbox leg_material leg.right.rear .75 26 1.5 ++!genrbox leg_material leg.left.rear .75 26 1.5 | xform -t 24 0 0 ++!genrbox leg_material leg.right.front .75 26 1.5 | xform -t 0 0 20 ++!genrbox leg_material leg.left.front .75 26 1.5 | xform -t 24 0 20 + + leg_material cylinder strut + 0 +@@ -63,6 +63,6 @@ arm_material ring arm.cap.left.front + 0 0 1 + 0 .75 + +-!genbox cushion_material seat 23.25 3 22 -r 1 | xform -t .75 18 0 ++!genrbox cushion_material seat 23.25 3 22 -r 1 | xform -t .75 18 0 + +-!genbox cushion_material back 23.25 3 10 -r 1 | xform -rx 80 -t .75 33 0 ++!genrbox cushion_material back 23.25 3 10 -r 1 | xform -rx 80 -t .75 33 0 +--- a/obj/office/cornerdesk.norm ++++ b/obj/office/cornerdesk.norm +@@ -297,8 +297,8 @@ ypine cylinder paneledge_rightrear + 7.5 2.2 0 + 0.05 + +-!genbox grey_plastic top_drawer 1.4 .5 1.1 -r .05 | xform -t .1 1.6 4.375 ++!genrbox grey_plastic top_drawer 1.4 .5 1.1 -r .05 | xform -t .1 1.6 4.375 + +-!genbox grey_plastic middle_drawer 1.4 .5 1.1 -r .05 | xform -t .1 1.05 4.375 ++!genrbox grey_plastic middle_drawer 1.4 .5 1.1 -r .05 | xform -t .1 1.05 4.375 + +-!genbox grey_plastic bottom_drawer 1.4 1 1.1 -r .05 | xform -t .1 0 4.375 ++!genrbox grey_plastic bottom_drawer 1.4 1 1.1 -r .05 | xform -t .1 0 4.375 +--- a/obj/office/openbook.norm ++++ b/obj/office/openbook.norm +@@ -35,11 +35,11 @@ page2_text plastic page2_mat + 0 + 5 .7 .7 .7 .05 .08 + +-!genbox cover_mat back_cover 6.5 .125 9.5 | xform -rz -1.1 -t 0 .125 0 ++!genrbox cover_mat back_cover 6.5 .125 9.5 | xform -rz -1.1 -t 0 .125 0 + +-!genbox cover_mat front_cover 6.5 .125 9.5 | xform -t -6.5 0 0 -rz 1.1 -t -1.125 .125 0 ++!genrbox cover_mat front_cover 6.5 .125 9.5 | xform -t -6.5 0 0 -rz 1.1 -t -1.125 .125 0 + +-!genbox cover_mat bind_cover 1.125 .125 9.5 | xform -t -1.125 0 0 ++!genrbox cover_mat bind_cover 1.125 .125 9.5 | xform -t -1.125 0 0 + + !genprism page1_mat page1 pageverts -l 0 0 9.3 | xform -t 0 0 .1 + +--- a/obj/texture/room2 ++++ b/obj/texture/room2 +@@ -17,7 +17,7 @@ void metal brass + 0 + 5 0.68 0.27 0.002 0.95 0 + +-!genbox brass track 70 2 3 | xform -t 35 94 88.5 ++!genrbox brass track 70 2 3 | xform -t 35 94 88.5 + + !xform -n flood1 -s 12 -rx -90 -rx 20 -t 40 84 90 flood + !xform -n flood2 -s 12 -rx -90 -rx 25 -t 60 84 90 flood +--- a/obj/virtual/draft_ang.rad ++++ b/obj/virtual/draft_ang.rad +@@ -64,7 +64,7 @@ void plastic pale_green + # Original units in inches + # + # xform -t 0 0 .5 +-# genbox x-aluminum leg 26 1 2 ++# genrbox x-aluminum leg 26 1 2 + + x-aluminum polygon leg.0.leg.1540 + 0 +@@ -152,7 +152,7 @@ chrome cone leg.0.frontfoot + 1.5494 0.6582312718 0.0127 + 0.0127 0.00635 + # xform -t 11.75 0 2.5 +-# genbox z-aluminum stand_support 2.5 .5 44.25 ++# genrbox z-aluminum stand_support 2.5 .5 44.25 + + z-aluminum polygon leg.0.stand_support.1540 + 0 +@@ -407,7 +407,7 @@ darker cylinder leg.0.knob_stem + # Original units in inches + # + # xform -t 0 0 .5 +-# genbox x-aluminum leg 26 1 2 ++# genrbox x-aluminum leg 26 1 2 + + x-aluminum polygon leg.1.leg.1540 + 0 +@@ -495,7 +495,7 @@ chrome cone leg.1.frontfoot + 0.0508 0.6582312718 0.0127 + 0.0127 0.00635 + # xform -t 11.75 0 2.5 +-# genbox z-aluminum stand_support 2.5 .5 44.25 ++# genrbox z-aluminum stand_support 2.5 .5 44.25 + + z-aluminum polygon leg.1.stand_support.1540 + 0 +@@ -744,7 +744,7 @@ darker cylinder leg.1.knob_stem + 0.0381 0.3407312718 1.1176 + 0.0127 + # xform -t 11.75 .5 8 +-# genbox y-aluminum kick_stand .5 59 3 ++# genrbox y-aluminum kick_stand .5 59 3 + + y-aluminum polygon kick_stand.1540 + 0 +@@ -814,7 +814,7 @@ darker cylinder axel + # Original units in inches + # + # xform -t -18 0 0 +-# genbox pale_green top 36 60 .75 ++# genrbox pale_green top 36 60 .75 + + pale_green polygon table.side1 + 0 +@@ -1378,7 +1378,7 @@ darker polygon table.adjust2.22 + 0.03556 0.420324943067 1.16555593701 + 0.0381 0.420324943067 1.16555593701 + # xform -t -17 .5 -1 +-# genbox darker left_support 34 1 1 ++# genrbox darker left_support 34 1 1 + + darker polygon table.left_support.1540 + 0 +@@ -1434,7 +1434,7 @@ darker polygon table.left_support.6457 + 1.5494 0.70054156705 0.946626716382 + 1.524 0.70054156705 0.946626716382 + # xform -t -17 58.5 -1 +-# genbox darker right_support 34 1 1 ++# genrbox darker right_support 34 1 1 + + darker polygon table.right_support.1540 + 0 +--- a/obj/virtual/draft_flat.rad ++++ b/obj/virtual/draft_flat.rad +@@ -64,7 +64,7 @@ void plastic pale_green + # Original units in inches + # + # xform -t 0 0 .5 +-# genbox x-aluminum leg 26 1 2 ++# genrbox x-aluminum leg 26 1 2 + + x-aluminum polygon leg.0.leg.1540 + 0 +@@ -152,7 +152,7 @@ chrome cone leg.0.frontfoot + 1.5494 0.6582312718 0.0127 + 0.0127 0.00635 + # xform -t 11.75 0 2.5 +-# genbox z-aluminum stand_support 2.5 .5 44.25 ++# genrbox z-aluminum stand_support 2.5 .5 44.25 + + z-aluminum polygon leg.0.stand_support.1540 + 0 +@@ -407,7 +407,7 @@ darker cylinder leg.0.knob_stem + # Original units in inches + # + # xform -t 0 0 .5 +-# genbox x-aluminum leg 26 1 2 ++# genrbox x-aluminum leg 26 1 2 + + x-aluminum polygon leg.1.leg.1540 + 0 +@@ -495,7 +495,7 @@ chrome cone leg.1.frontfoot + 0.0508 0.6582312718 0.0127 + 0.0127 0.00635 + # xform -t 11.75 0 2.5 +-# genbox z-aluminum stand_support 2.5 .5 44.25 ++# genrbox z-aluminum stand_support 2.5 .5 44.25 + + z-aluminum polygon leg.1.stand_support.1540 + 0 +@@ -744,7 +744,7 @@ darker cylinder leg.1.knob_stem + 0.0381 0.3407312718 1.1176 + 0.0127 + # xform -t 11.75 .5 8 +-# genbox y-aluminum kick_stand .5 59 3 ++# genrbox y-aluminum kick_stand .5 59 3 + + y-aluminum polygon kick_stand.1540 + 0 +@@ -814,7 +814,7 @@ darker cylinder axel + # Original units in inches + # + # xform -t -18 0 0 +-# genbox pale_green top 36 60 .75 ++# genrbox pale_green top 36 60 .75 + + pale_green polygon table.side1 + 0 +@@ -1378,7 +1378,7 @@ darker polygon table.adjust2.22 + 0.03556 0.4169312718 1.2192 + 0.0381 0.4169312718 1.2192 + # xform -t -17 .5 -1 +-# genbox darker left_support 34 1 1 ++# genrbox darker left_support 34 1 1 + + darker polygon table.left_support.1540 + 0 +@@ -1434,7 +1434,7 @@ darker polygon table.left_support.6457 + 1.5494 0.7725312718 1.2192 + 1.524 0.7725312718 1.2192 + # xform -t -17 58.5 -1 +-# genbox darker right_support 34 1 1 ++# genrbox darker right_support 34 1 1 + + darker polygon table.right_support.1540 + 0 +--- a/obj/virtual/environ.rad ++++ b/obj/virtual/environ.rad +@@ -61,7 +61,7 @@ void plastic neigh1.roof_mat + 5 .08 .08 .08 0 0 + + # xform -t 4 -20 0 +-# genbox neigh1.wall_mat neigh1 15 15 10 ++# genrbox neigh1.wall_mat neigh1 15 15 10 + + neigh1.xzwall_mat polygon neigh1.1540 + 0 +--- a/obj/virtual/illumoff.rad ++++ b/obj/virtual/illumoff.rad +@@ -52,7 +52,7 @@ void glass window_mat + # The building surfaces + # + # xform -t -.25 -.25 0 +-# genbox build_mat building 6.5 8.5 3.45 ++# genrbox build_mat building 6.5 8.5 3.45 + + build_mat polygon building.1540 + 0 +@@ -107,7 +107,7 @@ build_mat polygon building.6457 + # + # The room surfaces + # +-# genbox wall_mat wall 6 8 3.2 -i ++# genrbox wall_mat wall 6 8 3.2 -i + + wall_mat polygon wall.south + 0 +@@ -201,7 +201,7 @@ wall_mat polygon wall.east + # The light shelf + # + # xform -t .25 -1.5 2.175 +-# genbox shelfbot_mat shelf 5.5 2.5 .05 ++# genrbox shelfbot_mat shelf 5.5 2.5 .05 + + shelfbot_mat polygon shelf.1540 + 0 +--- a/obj/virtual/plainoff.rad ++++ b/obj/virtual/plainoff.rad +@@ -41,7 +41,7 @@ void glass window_mat + # The building surfaces + # + # xform -t -.25 -.25 0 +-# genbox build_mat building 6.5 8.5 3.45 ++# genrbox build_mat building 6.5 8.5 3.45 + + build_mat polygon building.1540 + 0 +@@ -97,7 +97,7 @@ build_mat polygon building.6457 + # + # The room surfaces + # +-# genbox wall_mat wall 6 8 3.2 -i ++# genrbox wall_mat wall 6 8 3.2 -i + + wall_mat polygon wall.south + 0 +@@ -157,7 +157,7 @@ wall_mat polygon wall.east + # The light shelf + # + # xform -t .25 -1.5 2.175 +-# genbox shelfbot_mat shelf 5.5 2.5 .05 ++# genrbox shelfbot_mat shelf 5.5 2.5 .05 + + shelfbot_mat polygon shelf.1540 + 0 +--- a/obj/virtual/stool.rad ++++ b/obj/virtual/stool.rad +@@ -932,7 +932,7 @@ leg_mat cylinder support + 0.3175 0.3175 0.7112 + 0.01905 + # xform -t -2.5 -2 28 +-# genbox leg_mat spring_mechanism 6 4 2.5 ++# genrbox leg_mat spring_mechanism 6 4 2.5 + + leg_mat polygon spring_mechanism.1540 + 0 +@@ -988,7 +988,7 @@ leg_mat polygon spring_mechanism.6457 + 0.2667 0.2286 0.7747 + 0.3683 0.2286 0.7747 + # xform -t 3.5 -.875 29.5 +-# genbox chrome_mat back_support.lower 10 1.75 .15 ++# genrbox chrome_mat back_support.lower 10 1.75 .15 + + chrome_mat polygon back_support.lower.1540 + 0 +@@ -1044,7 +1044,7 @@ chrome_mat polygon back_support.lower.64 + 0.295275 -0.0254 0.75311 + 0.339725 -0.0254 0.75311 + # xform -t 13.5 -.875 29.5 +-# genbox chrome_mat back_support.upper .15 1.75 15 ++# genrbox chrome_mat back_support.upper .15 1.75 15 + + chrome_mat polygon back_support.upper.1540 + 0 +@@ -1100,7 +1100,7 @@ chrome_mat polygon back_support.upper.64 + 0.295275 -0.02921 1.1303 + 0.339725 -0.02921 1.1303 + # xform -t -10 -8 30.5 +-# genbox seat_mat seat 18 16 3 -r 1 ++# genrbox seat_mat seat 18 16 3 -r 1 + + seat_mat polygon seat.dhgc + 0 +@@ -1292,7 +1292,7 @@ seat_mat sphere seat.o + 0 + 4 0.4953 0.1397 0.8255 0.0254 + # xform -t -1.5 -7 -5 -ry 15 -t 13.5 0 44.5 +-# genbox seat_mat back 1.5 14 10 -r .5 ++# genrbox seat_mat back 1.5 14 10 -r .5 + + seat_mat polygon back.dhgc + 0 --- radiance-4R0+20100729.orig/debian/patches/rename-genbox-src +++ radiance-4R0+20100729/debian/patches/rename-genbox-src @@ -0,0 +1,27 @@ +## rename-genbox-src.dpatch by Bernd Zeimetz +## +## DP: rename genbox in src + +@DPATCH@ +--- a/src/gen/Rmakefile ++++ b/src/gen/Rmakefile +@@ -13,7 +13,7 @@ INSTDIR = /usr/local/bin + + LIBDIR = /usr/local/lib/ray + +-PROGS = genbox gensky xform genblinds genrev genworm gendaylit \ ++PROGS = genrbox gensky xform genblinds genrev genworm gendaylit \ + gensurf genprism replmarks mkillum mksource genclock + + LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \ +@@ -34,8 +34,8 @@ clean: + genbeads: genbeads.o hermite3.o + $(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o $(MLIB) + +-genbox: genbox.o +- $(CC) $(CFLAGS) -o genbox genbox.o ++genrbox: genbox.o ++ $(CC) $(CFLAGS) -o genrbox genbox.o + + genmarble: genmarble.o ../common/random.h + $(CC) $(CFLAGS) -o genmarble genmarble.o $(MLIB) --- radiance-4R0+20100729.orig/debian/patches/librtrad-location +++ radiance-4R0+20100729/debian/patches/librtrad-location @@ -0,0 +1,37 @@ +## librtrad-location.dpatch by Bernd Zeimetz +## +## DP: put librtrad in the right directory while building + +@DPATCH@ +--- a/src/common/Rmakefile ++++ b/src/common/Rmakefile +@@ -34,22 +34,19 @@ SYSOBJ = ealloc.o fdate.o portio.o myhos + + OGLOBJ = rglfile.o rglmat.o rgldomat.o rglsurf.o rglinst.o rglsrc.o + +-LIBFILES = tmesh.cal ++LIBFILES = + +-librtrad.a: $(RTOBJ) $(PICOBJ) $(UTLOBJ) $(STDOBJ) $(SYSOBJ) +- rm -f librtrad.a +- ar rc librtrad.a $(RTOBJ) $(PICOBJ) $(UTLOBJ) $(STDOBJ) $(SYSOBJ) +- -ranlib librtrad.a ++../lib/librtrad.a: $(RTOBJ) $(PICOBJ) $(UTLOBJ) $(STDOBJ) $(SYSOBJ) ++ rm -f $@ ++ ar rc $@ $(RTOBJ) $(PICOBJ) $(UTLOBJ) $(STDOBJ) $(SYSOBJ) ++ -ranlib $@ + + install: all +- mv -f librtrad.a ../lib +- cd $(LIBDIR) && rm -f $(LIBFILES) +- cp -f $(LIBFILES) $(LIBDIR) + +-all: librtrad.a $(SPECIAL) ++all: ../lib/librtrad.a $(SPECIAL) + + clean: +- rm -f *.o librtrad.a ++ rm -f *.o ../lib/librtrad.a + + ogl: $(OGLOBJ) + rm -f librgl.a --- radiance-4R0+20100729.orig/debian/patches/use-system-libtiff +++ radiance-4R0+20100729/debian/patches/use-system-libtiff @@ -0,0 +1,93 @@ +--- a/src/common/Rmakefile ++++ b/src/common/Rmakefile +@@ -99,7 +99,7 @@ multisamp.o urand.o: random.h + cone.o face.o free_os.o image.o instance.o objset.o \ + octree.o modobject.o readfargs.o otypes.o mesh.o \ + readmesh.o readobj.o readoct.o sceneio.o: standard.h \ +-rtmisc.h rtio.h rtmath.h rterror.h fvect.h mat4.h tiff.h ++rtmisc.h rtio.h rtmath.h rterror.h fvect.h mat4.h + + image.o: view.h + +@@ -118,15 +118,15 @@ loadvars.o: vars.h + mesh.o readmesh.o: mesh.h lookup.h + + tonemap.o tmapcolrs.o tmapluv.o tmap16bit.o: tmprivat.h tonemap.h \ +-tiff.h color.h ++color.h + +-tmapluv.o: tiffio.h tmaptiff.h tiff.h ++tmapluv.o: tmaptiff.h + +-falsecolor.o: falsecolor.h tmprivat.h tonemap.h color.h tiff.h ++falsecolor.o: falsecolor.h tmprivat.h tonemap.h color.h + + tonemap.o: tmerrmsg.h + +-tmaptiff.o: tmprivat.h tmaptiff.h color.h tonemap.h tiff.h ++tmaptiff.o: tmprivat.h tmaptiff.h color.h tonemap.h + + rglfile.o rglmat.o rgldomat.o rglsurf.o rglinst.o rglsrc.o: radogl.h \ + standard.h mat4.h fvect.h color.h object.h otypes.h lookup.h +@@ -140,11 +140,11 @@ byteswap.o expandarg.o badarg.o xf.o: rt + + expandarg.o: rtmisc.h + +-dircode.o xf.o: rtmath.h mat4.h fvect.h tiff.h ++dircode.o xf.o: rtmath.h mat4.h fvect.h + + error.o: rterror.h + +-bmpfile.o: bmpfile.h tiff.h ++bmpfile.o: bmpfile.h + + header.o readmesh.o readoct.o resolu.o rglinst.o tmapcolrs.o: resolu.h + +--- a/src/px/Rmakefile ++++ b/src/px/Rmakefile +@@ -47,7 +47,6 @@ pbilat.csh + + clean: + rm -f $(PROGS) $(SPECIAL) *.o core x11findwind.c +- cd tiff; make distclean + + pfilt: pfilt.o pf2.o pf3.o + $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrtrad $(MLIB) +@@ -120,26 +119,12 @@ pinterp: pinterp.o + ra_xyze: ra_xyze.o + $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrtrad $(MLIB) + +-ra_tiff: ra_tiff.o ../lib/libtiff.a ++ra_tiff: ra_tiff.o + $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrtrad -ltiff $(MLIB) + +-../common/tiff.h ../common/tiffio.h: ../lib/libtiff.a +- @chmod u+w ../common/tiff.h ../common/tiffio.h +- @touch ../common/tiff.h ../common/tiffio.h +- +-normtiff: normtiff.o ../lib/libtiff.a ++normtiff: normtiff.o + $(CC) $(CFLAGS) -o normtiff normtiff.o -lrtrad -ltiff $(MLIB) + +-../lib/libtiff.a: +- cd tiff ; ./configure -C -quiet -with-CC=$(CC) \ +- "--libdir=`pwd`/../../lib" "--includedir=`pwd`/../../common" \ +- --enable-static --disable-shared --disable-cxx \ +- --enable-logluv --disable-jpeg \ +- --disable-zlib --disable-pixarlog \ +- "-with-ENVOPTS=$(OPT)" ; \ +- cd port ; make all ; \ +- cd ../libtiff ; make install +- + xshowtrace: xshowtrace.o x11findwind.o + $(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \ + x11findwind.o -lrtrad -lX11 $(MLIB) +@@ -181,8 +166,6 @@ x11image.o: ../common/tonemap.h ../commo + + ra_t8.o: ../common/targa.h + +-ra_tiff.o normtiff.o: ../common/tiff.h ../common/tiffio.h +- + ra_t8.o: pic.h + + pcomb.o pfilt.o pinterp.o x11image.o x11showtrace.o \