diff -Nru dizzy-0.3/debian/changelog dizzy-0.3/debian/changelog --- dizzy-0.3/debian/changelog 2012-03-17 21:58:44.000000000 +0000 +++ dizzy-0.3/debian/changelog 2014-01-14 08:26:49.000000000 +0000 @@ -1,3 +1,27 @@ +dizzy (0.3-2) unstable; urgency=low + + * Team upload + + [ gregor herrmann ] + * debian/control: update {versioned,alternative} (build) dependencies. + + [ Salvatore Bonaccorso ] + * Add Add-missing-use-SDL-Mouse.patch patch. + Add 'use SDL::Mouse' in dizzy. Fix "fullscreen display with '-f' fails + on undefined subroutine, '&SDL::Mouse::show_cursor' at line 61". + Thanks to The Wanderer (Closes: #697423) + + [ Damyan Ivanov ] + * patch installed executables fixing interpreter path + Closes: #734160 -- dizzy hardcodes wrong path to perl, fails to start + * also patch away "use lib 'lib'", which is perl equivalent for PATH=.:$PATH + * add patch ignoring unknown OPs + Closes: #730737 -- exits immediately with "strict refs" error in + Perl2GLSL.pm, line 160 + * Declare conformance with Policy 3.9.5 + + -- Damyan Ivanov Tue, 14 Jan 2014 10:26:47 +0200 + dizzy (0.3-1) unstable; urgency=low * Team upload. diff -Nru dizzy-0.3/debian/control dizzy-0.3/debian/control --- dizzy-0.3/debian/control 2012-03-17 21:58:44.000000000 +0000 +++ dizzy-0.3/debian/control 2014-01-14 08:25:50.000000000 +0000 @@ -1,23 +1,24 @@ Source: dizzy +Maintainer: Debian Perl Group +Uploaders: Maximilian Gass Section: games Priority: optional Build-Depends: debhelper (>= 8) Build-Depends-Indep: perl, - libfile-copy-recursive-perl, - libfile-find-rule-perl -Maintainer: Debian Perl Group -Uploaders: Maximilian Gass + libfile-copy-recursive-perl, + libfile-find-rule-perl +Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/dizzy.git;a=summary Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/dizzy.git -Standards-Version: 3.9.3 Homepage: http://penma.de/code/dizzy Package: dizzy Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, - libconvert-color-perl, - libopengl-perl (>= 0.58), - libsdl-perl (>= 2.500) +Depends: ${perl:Depends}, + ${misc:Depends}, + libconvert-color-perl, + libopengl-perl, + libsdl-perl (>= 2.500) Description: Graphics demo that makes you dizzy using rotating textures dizzy is a graphics demo that rotates planes of patterns on a colored background to make you dizzy. Textures can be cross-faded and there is a mode @@ -26,9 +27,10 @@ Package: xscreensaver-screensaver-dizzy Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, - dizzy (= ${source:Version}), - libopengl-xscreensaver-perl +Depends: ${perl:Depends}, + ${misc:Depends}, + dizzy (= ${source:Version}), + libopengl-xscreensaver-perl Description: Graphics demo that makes you dizzy (XScreenSaver hack) dizzy is a graphics demo that rotates planes of patterns on a colored background to make you dizzy. Textures can be cross-faded and there is a mode @@ -38,3 +40,4 @@ This package integrates dizzy with XScreenSaver, but it cannot be done automatically. See /usr/share/doc/xscreensaver-screensaver-dizzy/README.Debian for details on the configuration. + diff -Nru dizzy-0.3/debian/patches/Add-missing-use-SDL-Mouse.patch dizzy-0.3/debian/patches/Add-missing-use-SDL-Mouse.patch --- dizzy-0.3/debian/patches/Add-missing-use-SDL-Mouse.patch 1970-01-01 00:00:00.000000000 +0000 +++ dizzy-0.3/debian/patches/Add-missing-use-SDL-Mouse.patch 2014-01-14 07:16:49.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Add missing use of SDL::Mouse; +Origin: vendor +Bug-Debian: http://bugs.debian.org/697423 +Forwarded: yes +Author: Salvatore Bonaccorso +Last-Update: 2013-01-05 +Applied: https://github.com/penma/dizzy/commit/ee20624402edf9e00f21f7eba42854c73c1df3a3 + +--- a/dizzy ++++ b/dizzy +@@ -7,6 +7,7 @@ + + use OpenGL qw(:all); + use SDL 2.5 qw(:init); ++use SDL::Mouse; + use SDL::Video; + use SDL::Surface; + use SDL::Event; diff -Nru dizzy-0.3/debian/patches/ignore-unknown-ops.patch dizzy-0.3/debian/patches/ignore-unknown-ops.patch --- dizzy-0.3/debian/patches/ignore-unknown-ops.patch 1970-01-01 00:00:00.000000000 +0000 +++ dizzy-0.3/debian/patches/ignore-unknown-ops.patch 2014-01-14 07:19:32.000000000 +0000 @@ -0,0 +1,24 @@ +Description: fix "Can't use string..." as an ARRAY ref at line 160 + Not sure what other problems this creates, but it seems to fix the + problem at hand, which was making dizzy completely unusable. + . + Upstream approved the patch privately suggesting that ignoring unknown OPs + seems to be the right thing to do. +Author: Damyan Ivanov +Bug-Debian: https://bugs.debian.org/730737 +Forwarded: yes + +--- a/lib/Dizzy/Perl2GLSL.pm ++++ b/lib/Dizzy/Perl2GLSL.pm +@@ -50,10 +50,8 @@ sub walk_optree { + } elsif ($optype eq "OP") { + if ($op->name eq "padsv") { + return "var" . $op->targ; +- } elsif ($op->name eq "pushmark" or $op->name eq "null") { +- return (); + } else { +- return "# op description " . $op->desc; ++ return (); + } + } elsif ($optype eq "COP") { + return (); diff -Nru dizzy-0.3/debian/patches/series dizzy-0.3/debian/patches/series --- dizzy-0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ dizzy-0.3/debian/patches/series 2014-01-14 07:20:24.000000000 +0000 @@ -0,0 +1,2 @@ +Add-missing-use-SDL-Mouse.patch +ignore-unknown-ops.patch diff -Nru dizzy-0.3/debian/rules dizzy-0.3/debian/rules --- dizzy-0.3/debian/rules 2012-03-17 21:58:44.000000000 +0000 +++ dizzy-0.3/debian/rules 2014-01-14 07:16:49.000000000 +0000 @@ -6,6 +6,11 @@ override_dh_auto_install: ./install_dizzy --set vendor --bin-path /usr/games \ --install-root ./debian/tmp --install-xscreensaver + sed -i -e 's,^#!/usr/bin/env perl,#!/usr/bin/perl,' \ + -e "s,^use lib 'lib';,," \ + debian/tmp/usr/games/dizzy \ + debian/tmp/usr/lib/xscreensaver/dizzy \ + debian/tmp/usr/sbin/dizzy-render %: dh $@