Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package povray
Fixes an upgrade issue from squeeze: dpkg prompting about modified
conffiles due to unconditionally renaming the old ones in the preinst.
* povray in squeeze was in non-free
* wheezy did not ship povray at all
Switch to dpkg-maintscript-helper mv_conffile to do this properly.
(no bug filed, Severity: serious)
Fix some bashisms by using bash as the interpreter for these scripts.
(#772356, important)
unblock povray/3.7.0.0-7
diff -Nru povray-3.7.0.0/debian/changelog povray-3.7.0.0/debian/changelog
--- povray-3.7.0.0/debian/changelog 2014-09-29 17:55:20.000000000 +0200
+++ povray-3.7.0.0/debian/changelog 2014-12-15 11:06:09.000000000 +0100
@@ -1,3 +1,25 @@
+povray (1:3.7.0.0-7) unstable; urgency=medium
+
+ * 40_bashism.diff: Use bash as the interpreter for scripts that use
+ non-posix extensions of the 'read' builtin (allanim.sh, allscene.sh,
+ portfolio.sh). Patch all scripts consistently. (Closes: #772356)
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 15 Dec 2014 11:05:58 +0100
+
+povray (1:3.7.0.0-6) unstable; urgency=medium
+
+ * povray.maintscript: New. Use dpkg-maintscript-helper to rename the
+ conffiles from the squeeze package: /etc/povray/3.6/povray.{ini,conf} to
+ /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
+ dpkg-maintscript-helper handled the conffiles.
+ * Update Vcs-Browser URL.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 14 Dec 2014 01:47:17 +0100
+
povray (1:3.7.0.0-5) unstable; urgency=medium
* povray-includes: No longer use a symlinked doc directory to restore
diff -Nru povray-3.7.0.0/debian/control povray-3.7.0.0/debian/control
--- povray-3.7.0.0/debian/control 2014-09-29 17:55:20.000000000 +0200
+++ povray-3.7.0.0/debian/control 2014-12-15 11:06:09.000000000 +0100
@@ -17,13 +17,14 @@
libopenexr-dev,
libsdl-dev,
libxpm-dev,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.povray.org
Vcs-Git: git://anonscm.debian.org/collab-maint/povray.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/povray.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/povray.git
Package: povray
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: povray-includes
Suggests: povray-doc, povray-examples
diff -Nru povray-3.7.0.0/debian/patches/40_bashism.diff povray-3.7.0.0/debian/patches/40_bashism.diff
--- povray-3.7.0.0/debian/patches/40_bashism.diff 2014-09-29 17:55:20.000000000 +0200
+++ povray-3.7.0.0/debian/patches/40_bashism.diff 2014-12-15 11:06:09.000000000 +0100
@@ -1,6 +1,50 @@
+Author: Andreas Beckmann <a...@debian.org>
+Description: use bash as interpreter for scripts using non-posix extensions for "read"
+Bug-Debian: https://bugs.debian.org/772356
+
--- a/unix/scripts/portfolio.sh
+++ b/unix/scripts/portfolio.sh
-@@ -86,7 +86,7 @@
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ==============================================================================
+ # POV-Ray 3.7
+ # portfolio.sh - render the POV-Ray portfolio
+@@ -86,7 +86,7 @@ if [ ! -d "$SCENE_DIR" ] ; then
+ echo " so this script does not work."
+ echo " Try reinstalling POV-Ray."
+ echo "------------------------------------------------------"
+- read
++ read dontcare
+ exit
+ fi
+
+--- a/unix/scripts/allanim.sh
++++ b/unix/scripts/allanim.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ==============================================================================
+ # POV-Ray 3.7
+ # allanim.sh - render all POV-Ray sample animations
+@@ -89,7 +89,7 @@ if [ ! -d "$SCENE_DIR" ] ; then
+ echo " so this script does not work."
+ echo " Try reinstalling POV-Ray."
+ echo "------------------------------------------------------"
+- read
++ read dontcare
+ exit
+ fi
+
+--- a/unix/scripts/allscene.sh
++++ b/unix/scripts/allscene.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # ==============================================================================
+ # POV-Ray 3.7
+ # allscene.sh - render all POV-Ray sample scenes
+@@ -95,7 +95,7 @@ if [ ! -d "$SCENE_DIR" ] ; then
echo " so this script does not work."
echo " Try reinstalling POV-Ray."
echo "------------------------------------------------------"
diff -Nru povray-3.7.0.0/debian/povray.maintscript povray-3.7.0.0/debian/povray.maintscript
--- povray-3.7.0.0/debian/povray.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ povray-3.7.0.0/debian/povray.maintscript 2014-12-15 11:06:09.000000000 +0100
@@ -0,0 +1,2 @@
+mv_conffile /etc/povray/3.6/povray.ini /etc/povray/3.7/povray.ini 1:3.7~
+mv_conffile /etc/povray/3.6/povray.conf /etc/povray/3.7/povray.conf 1:3.7~
diff -Nru povray-3.7.0.0/debian/povray.postinst povray-3.7.0.0/debian/povray.postinst
--- povray-3.7.0.0/debian/povray.postinst 1970-01-01 01:00:00.000000000 +0100
+++ povray-3.7.0.0/debian/povray.postinst 2014-12-15 11:06:09.000000000 +0100
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ]; then
+ if [ -d /etc/povray/3.6 ]; then
+ rmdir --ignore-fail-on-non-empty /etc/povray/3.6
+ fi
+fi
diff -Nru povray-3.7.0.0/debian/povray.preinst povray-3.7.0.0/debian/povray.preinst
--- povray-3.7.0.0/debian/povray.preinst 2014-09-29 17:55:20.000000000 +0200
+++ povray-3.7.0.0/debian/povray.preinst 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-#! /bin/sh
-# preinst script for yaws
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-
-case "$1" in
- install|upgrade)
- # rename old config directory:
- if [ -d /etc/povray/3.6 -a ! -d /etc/povray/3.7 ]; then
- mv /etc/povray/3.6 /etc/povray/3.7
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
