--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package povray
This update fixes incorrect conffile references to /usr/local/etc in
some scripts (reported in Ubuntu) and some followup fixes to make
these scripts work as intended by upstream if they are called without
arguments (and let them warn about missing povray-examples in case)
This should improve new user experience if things work like described by
upstream :-)
Andreas
unblock povray/3.7.0.0-8
diffstat for povray-3.7.0.0 povray-3.7.0.0
changelog | 15 ++++-
copyright | 2
patches/no-usr-local.patch | 79 +++++++++++++++++++++++++++
patches/report-missing-povray-examples.patch | 36 ++++++++++++
patches/scene-directory-symlink.patch | 39 +++++++++++++
patches/series | 3 +
povray-examples.links | 1
7 files changed, 173 insertions(+), 2 deletions(-)
diff -Nru povray-3.7.0.0/debian/changelog povray-3.7.0.0/debian/changelog
--- povray-3.7.0.0/debian/changelog 2014-12-15 11:06:09.000000000 +0100
+++ povray-3.7.0.0/debian/changelog 2015-01-26 00:04:09.000000000 +0100
@@ -1,3 +1,16 @@
+povray (1:3.7.0.0-8) unstable; urgency=medium
+
+ * no-usr-local.patch: Fix references to /usr/local/etc in example scripts.
+ (LP: #1343048)
+ * report-missing-povray-examples.patch: Let scripts report that
+ povray-examples may be needed if scene data cannot be found.
+ * povray-examples: Add symlink at upstream's location for the scenes:
+ /usr/share/povray-3.7/scenes -> ../doc/povray/examples
+ * scene-directory-symlink.patch: Let scripts cope with SCENE_DIR being a
+ symlink.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 26 Jan 2015 00:03:59 +0100
+
povray (1:3.7.0.0-7) unstable; urgency=medium
* 40_bashism.diff: Use bash as the interpreter for scripts that use
@@ -13,7 +26,7 @@
/etc/povray/3.7/povray.{ini,conf}. Needs ${misc:Pre-Depends}.
* povray.preinst: Remove. Directly renaming the directory resulted in dpkg
prompting about modified conffiles.
- * povray.postinst: New. Remove the empty directory after
+ * povray.postinst: New. Remove the empty directory /etc/povray/3.6 after
dpkg-maintscript-helper handled the conffiles.
* Update Vcs-Browser URL.
* Bump Standards-Version to 3.9.6, no changes needed.
diff -Nru povray-3.7.0.0/debian/copyright povray-3.7.0.0/debian/copyright
--- povray-3.7.0.0/debian/copyright 2014-12-15 11:06:09.000000000 +0100
+++ povray-3.7.0.0/debian/copyright 2015-01-26 00:04:09.000000000 +0100
@@ -27,7 +27,7 @@
© 2004 Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
© 2005-2006 Clément Stenac <zorglub@debian.org>
© 2007-2009 Torsten Werner <twerner@debian.org>
- © 2014 Andreas Beckmann <anbe@debian.org>
+ © 2014-2015 Andreas Beckmann <anbe@debian.org>
License: GPL-2.0+
Files: debian/patches/*
diff -Nru povray-3.7.0.0/debian/patches/no-usr-local.patch povray-3.7.0.0/debian/patches/no-usr-local.patch
--- povray-3.7.0.0/debian/patches/no-usr-local.patch 1970-01-01 01:00:00.000000000 +0100
+++ povray-3.7.0.0/debian/patches/no-usr-local.patch 2015-01-26 00:04:09.000000000 +0100
@@ -0,0 +1,79 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix references to /usr/local/etc
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/povray/+bug/1343048
+
+--- a/unix/povray.conf
++++ b/unix/povray.conf
+@@ -25,7 +25,8 @@
+ ; setuid or setgid.
+ ;
+ ; POV-Ray will look in two places for this file: in a system-wide directory
+-; (typically /usr/local/etc/povray/3.7/povray.conf) and in the user's home
++; (typically /usr/local/etc/povray/3.7/povray.conf or
++; /etc/povray/3.7/povray.conf) and in the user's home
+ ; directory (as ~/.povray/3.7/povray.conf). POV-Ray will always use the
+ ; most strict version of what is specified; user settings can only make
+ ; security more strict.
+--- a/unix/scripts/allanim.sh
++++ b/unix/scripts/allanim.sh
+@@ -18,7 +18,7 @@
+ # log: log all text output of POV-Ray to a file (log.txt)
+ # scene_directory: if specified the sample scene in this directory are rendered,
+ # otherwise the scene directory is determined form the main
+-# povray ini file (usually /usr/local/share/povray-3.7/scenes).
++# povray ini file (usually /usr/share/povray-3.7/scenes).
+ # html_file: if specified a HTML file with links to the rendered
+ # animations is written.
+ # ==============================================================================
+@@ -28,8 +28,7 @@
+
+ VERSION=3.7
+ VER_DIR=povray-$VERSION
+-DEFAULT_DIR=/usr/local
+-SYSCONFDIR=$DEFAULT_DIR/etc
++SYSCONFDIR=/etc
+
+ install_dir()
+ {
+--- a/unix/scripts/allscene.sh
++++ b/unix/scripts/allscene.sh
+@@ -20,7 +20,7 @@
+ # options for running
+ # scene_directory: if specified the sample scene in this directory are rendered,
+ # otherwise the scene directory is determined form the main
+-# povray ini file (usually /usr/local/share/povray-3.7/scenes).
++# povray ini file (usually /usr/share/povray-3.7/scenes).
+ # html_file: if specified a HTML file with links to the rendered
+ # images is written. If Imagemagick 'convert' is installed
+ # thumbnails for the images are generated as well.
+@@ -32,8 +32,7 @@
+
+ VERSION=3.7
+ VER_DIR=povray-$VERSION
+-DEFAULT_DIR=/usr/local
+-SYSCONFDIR=$DEFAULT_DIR/etc
++SYSCONFDIR=/etc
+
+ install_dir()
+ {
+--- a/unix/scripts/portfolio.sh
++++ b/unix/scripts/portfolio.sh
+@@ -19,7 +19,7 @@
+ # scene_directory: if specified the portfolio scene in this directory are
+ # rendered, otherwise the scene directory is determined form
+ # the main povray ini file.
+-# (usually /usr/local/share/povray-3.7/scenes/portfolio).
++# (usually /usr/share/povray-3.7/scenes/portfolio).
+ # ==============================================================================
+
+ # test mode
+@@ -27,8 +27,7 @@
+
+ VERSION=3.7
+ VER_DIR=povray-$VERSION
+-DEFAULT_DIR=/usr/local
+-SYSCONFDIR=$DEFAULT_DIR/etc
++SYSCONFDIR=/etc
+
+ install_dir()
+ {
diff -Nru povray-3.7.0.0/debian/patches/report-missing-povray-examples.patch povray-3.7.0.0/debian/patches/report-missing-povray-examples.patch
--- povray-3.7.0.0/debian/patches/report-missing-povray-examples.patch 1970-01-01 01:00:00.000000000 +0100
+++ povray-3.7.0.0/debian/patches/report-missing-povray-examples.patch 2015-01-26 00:04:09.000000000 +0100
@@ -0,0 +1,36 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: report that the povray-examples package is needed
+
+--- a/unix/scripts/allanim.sh
++++ b/unix/scripts/allanim.sh
+@@ -86,7 +86,7 @@ if [ ! -d "$SCENE_DIR" ] ; then
+ echo "------------------------------------------------------"
+ echo " Your POV-Ray installation seems to be defective"
+ echo " so this script does not work."
+- echo " Try reinstalling POV-Ray."
++ echo " Try installing the povray-examples package."
+ echo "------------------------------------------------------"
+ read dontcare
+ exit
+--- a/unix/scripts/allscene.sh
++++ b/unix/scripts/allscene.sh
+@@ -92,7 +92,7 @@ if [ ! -d "$SCENE_DIR" ] ; then
+ echo "------------------------------------------------------"
+ echo " Your POV-Ray installation seems to be defective"
+ echo " so this script does not work."
+- echo " Try reinstalling POV-Ray."
++ echo " Try installing the povray-examples package."
+ echo "------------------------------------------------------"
+ read dontcare
+ exit
+--- a/unix/scripts/portfolio.sh
++++ b/unix/scripts/portfolio.sh
+@@ -83,7 +83,7 @@ if [ ! -d "$SCENE_DIR" ] ; then
+ echo "------------------------------------------------------"
+ echo " Your POV-Ray installation seems to be defective"
+ echo " so this script does not work."
+- echo " Try reinstalling POV-Ray."
++ echo " Try installing the povray-examples package."
+ echo "------------------------------------------------------"
+ read dontcare
+ exit
diff -Nru povray-3.7.0.0/debian/patches/scene-directory-symlink.patch povray-3.7.0.0/debian/patches/scene-directory-symlink.patch
--- povray-3.7.0.0/debian/patches/scene-directory-symlink.patch 1970-01-01 01:00:00.000000000 +0100
+++ povray-3.7.0.0/debian/patches/scene-directory-symlink.patch 2015-01-26 00:04:09.000000000 +0100
@@ -0,0 +1,39 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: do not fail to find scenes if SCENE_DIR is a symlink
+
+--- a/unix/scripts/allanim.sh
++++ b/unix/scripts/allanim.sh
+@@ -111,7 +111,7 @@ fi
+
+ SCRIPT_DIR=`dirname "$0"`
+
+-FILE_LIST=`find "$SCENE_DIR" -path "*animations*" -name "*.pov" | sort`
++FILE_LIST=`find "$SCENE_DIR/" -path "*animations*" -name "*.pov" | sort`
+
+ if [ -z "$LOG_FILE" ] ; then
+ echo "$FILE_LIST" | xargs -n 1 "$SCRIPT_DIR/render_anim.sh" "$OUTPUT_DIR"
+--- a/unix/scripts/allscene.sh
++++ b/unix/scripts/allscene.sh
+@@ -117,9 +117,9 @@ fi
+ SCRIPT_DIR=`dirname "$0"`
+
+ if [ -z "$RENDER_ALL" ] ; then
+- FILE_LIST=`find "$SCENE_DIR" -not -path "*animations*" -not -path "*portfolio*" -name "*.pov" | sort -r | xargs grep -l -E '^//[ ]+[-+]{1}[^ -]'`
++ FILE_LIST=`find "$SCENE_DIR/" -not -path "*animations*" -not -path "*portfolio*" -name "*.pov" | sort -r | xargs grep -l -E '^//[ ]+[-+]{1}[^ -]'`
+ else
+- FILE_LIST=`find "$SCENE_DIR" -not -path "*animations*" -not -path "*portfolio*" -name "*.pov" | sort -r`
++ FILE_LIST=`find "$SCENE_DIR/" -not -path "*animations*" -not -path "*portfolio*" -name "*.pov" | sort -r`
+ fi
+
+ if [ -z "$LOG_FILE" ] ; then
+--- a/unix/scripts/portfolio.sh
++++ b/unix/scripts/portfolio.sh
+@@ -120,7 +120,7 @@ CURR_DIR=`pwd`
+ SCENE_DIR=`echo "$SCENE_DIR" | sed "s?^\.?$CURR_DIR?"`
+ SCENE_DIR=`echo "$SCENE_DIR" | sed "s?^\([^/]\)?$CURR_DIR/\1?"`
+
+-FILE_LIST=`find "$SCENE_DIR" -not -path "*__empty*" -name "*.ini" | sort`
++FILE_LIST=`find "$SCENE_DIR/" -not -path "*__empty*" -name "*.ini" | sort`
+
+ cd "$OUTPUT_DIR"
+
diff -Nru povray-3.7.0.0/debian/patches/series povray-3.7.0.0/debian/patches/series
--- povray-3.7.0.0/debian/patches/series 2014-12-15 11:06:09.000000000 +0100
+++ povray-3.7.0.0/debian/patches/series 2015-01-26 00:04:09.000000000 +0100
@@ -15,3 +15,6 @@
verify_POV_LONG_is_64bit.patch
correctly_use_POSIX_V6_LP64_OFF64.patch
kfreebsd.patch
+no-usr-local.patch
+report-missing-povray-examples.patch
+scene-directory-symlink.patch
diff -Nru povray-3.7.0.0/debian/povray-examples.links povray-3.7.0.0/debian/povray-examples.links
--- povray-3.7.0.0/debian/povray-examples.links 1970-01-01 01:00:00.000000000 +0100
+++ povray-3.7.0.0/debian/povray-examples.links 2015-01-26 00:04:09.000000000 +0100
@@ -0,0 +1 @@
+/usr/share/doc/povray/examples /usr/share/povray-3.7/scenes
--- End Message ---