[Pkg-octave-commit] [SCM] Debian packaging for octave-vrml branch, master, updated. debian/1.0.11-3-12-gd5a3b7c
Rafael Laboissiere
rafael at laboissiere.net
Mon Jun 18 18:04:25 UTC 2012
The following commit has been merged in the master branch:
commit 29b5e454631994fc5e34a65350b70519f43becd3
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Thu Jun 14 05:53:29 2012 +0000
Drop patch remove_unused_files (applied upstream)
diff --git a/debian/patches/remove_unused_files b/debian/patches/remove_unused_files
deleted file mode 100644
index 3e9c324..0000000
--- a/debian/patches/remove_unused_files
+++ /dev/null
@@ -1,369 +0,0 @@
-From: Etienne Grossmann
-Subject: Remove unused files
-
-Origin: upstream,http://octave.svn.sourceforge.net/viewvc/octave?view=rev&revision=7266
-
---- a/data/defSpeakBox.wrl
-+++ /dev/null
-@@ -1,88 +0,0 @@
--#VRML V2.0 utf8
--
--# Sphere whose color changes when it is touched
--#
--# Author : Etienne Grossmann <etienne at isr.ist.utl.pt>
--
--
--# A sphere with a touch sensor
--PROTO ClickSphere [
-- eventIn SFColor the_color # This event accepted (from script)
-- eventOut SFTime touched # This event emitted when touched
-- field SFVec3f the_pos 0 0 0
-- field SFVec3f the_scale 1 1 1
--] {
-- Transform {
-- translation IS the_pos
-- scale IS the_scale
-- children [
-- TouchSensor { touchTime IS touched }
--
-- Shape {
-- appearance Appearance {material Material {diffuseColor IS the_color}}
-- ## geometry Sphere { }
-- geometry Box { }
-- }
-- ]
-- }
--}
--
--# A SpeakSphere is a sphere that changes color and prints out its tag
--# and current state when clicked upon.
--#
--# Output format is : TAG:<tag> STATE:<state>
--
--PROTO SpeakSphere [
-- field SFColor col1 0.4 0.4 0.9
-- field SFColor col2 0.4 0.9 0.4
-- field SFVec3f pos 0 0 0
-- field SFVec3f scale 1 1 1
-- field SFInt32 state 0
-- field SFString tag "No Tag"
--] {
-- Group {
-- children [
-- # The sphere itself is here
-- DEF TS ClickSphere {
-- the_pos IS pos
-- the_scale IS scale
-- }
--
-- # The script that receives pointer
-- # events from the ClickSphere, updates
-- # the state of the SpeakSphere
-- DEF PS Script {
-- eventIn SFTime touch_function
-- eventOut SFColor col
-- field SFInt32 sstate IS state
-- field SFColor scol1 IS col1
-- field SFColor scol2 IS col2
-- field SFString stag IS tag
-- url [
-- "perl:
-- # $t is the (tied) hash that
-- # represents the Script node : the
-- # eventIn/eventOut/field are keys.
-- touch_function => sub {
--
-- $t->{sstate} ^= 1 ;
--
-- print qq{TAG:$t->{stag} STATE:$t->{sstate}}.chr(10);
--
-- # Set the eventOut 'col'
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- },
-- initialize => sub {
-- # Set initial col
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- }
-- "
-- ]
-- }
-- ]
-- }
-- # Send touch event into script and
-- # updated color into ClickSphere
-- ROUTE TS.touched TO PS.touch_function
-- ROUTE PS.col TO TS.the_color
--}
---- a/data/defSpeakSphere.wrl
-+++ /dev/null
-@@ -1,88 +0,0 @@
--#VRML V2.0 utf8
--
--# Sphere whose color changes when it is touched
--#
--# Author : Etienne Grossmann <etienne at isr.ist.utl.pt>
--
--
--# A sphere with a touch sensor
--PROTO ClickSphere [
-- eventIn SFColor the_color # This event accepted (from script)
-- eventOut SFTime touched # This event emitted when touched
-- field SFVec3f the_pos 0 0 0
-- field SFVec3f the_scale 1 1 1
--] {
-- Transform {
-- translation IS the_pos
-- scale IS the_scale
-- children [
-- TouchSensor { touchTime IS touched }
--
-- Shape {
-- appearance Appearance {material Material {diffuseColor IS the_color}}
-- geometry Sphere { }
-- ## geometry Box { }
-- }
-- ]
-- }
--}
--
--# A SpeakSphere is a sphere that changes color and prints out its tag
--# and current state when clicked upon.
--#
--# Output format is : TAG:<tag> STATE:<state>
--
--PROTO SpeakSphere [
-- field SFColor col1 0.4 0.4 0.9
-- field SFColor col2 0.4 0.9 0.4
-- field SFVec3f pos 0 0 0
-- field SFVec3f scale 1 1 1
-- field SFInt32 state 0
-- field SFString tag "No Tag"
--] {
-- Group {
-- children [
-- # The sphere itself is here
-- DEF TS ClickSphere {
-- the_pos IS pos
-- the_scale IS scale
-- }
--
-- # The script that receives pointer
-- # events from the ClickSphere, updates
-- # the state of the SpeakSphere
-- DEF PS Script {
-- eventIn SFTime touch_function
-- eventOut SFColor col
-- field SFInt32 sstate IS state
-- field SFColor scol1 IS col1
-- field SFColor scol2 IS col2
-- field SFString stag IS tag
-- url [
-- "perl:
-- # $t is the (tied) hash that
-- # represents the Script node : the
-- # eventIn/eventOut/field are keys.
-- touch_function => sub {
--
-- $t->{sstate} ^= 1 ;
--
-- print qq{TAG:$t->{stag} STATE:$t->{sstate}}.chr(10);
--
-- # Set the eventOut 'col'
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- },
-- initialize => sub {
-- # Set initial col
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- }
-- "
-- ]
-- }
-- ]
-- }
-- # Send touch event into script and
-- # updated color into ClickSphere
-- ROUTE TS.touched TO PS.touch_function
-- ROUTE PS.col TO TS.the_color
--}
---- a/inst/data/defSpeakBox.wrl
-+++ /dev/null
-@@ -1,88 +0,0 @@
--#VRML V2.0 utf8
--
--# Sphere whose color changes when it is touched
--#
--# Author : Etienne Grossmann <etienne at isr.ist.utl.pt>
--
--
--# A sphere with a touch sensor
--PROTO ClickSphere [
-- eventIn SFColor the_color # This event accepted (from script)
-- eventOut SFTime touched # This event emitted when touched
-- field SFVec3f the_pos 0 0 0
-- field SFVec3f the_scale 1 1 1
--] {
-- Transform {
-- translation IS the_pos
-- scale IS the_scale
-- children [
-- TouchSensor { touchTime IS touched }
--
-- Shape {
-- appearance Appearance {material Material {diffuseColor IS the_color}}
-- ## geometry Sphere { }
-- geometry Box { }
-- }
-- ]
-- }
--}
--
--# A SpeakSphere is a sphere that changes color and prints out its tag
--# and current state when clicked upon.
--#
--# Output format is : TAG:<tag> STATE:<state>
--
--PROTO SpeakSphere [
-- field SFColor col1 0.4 0.4 0.9
-- field SFColor col2 0.4 0.9 0.4
-- field SFVec3f pos 0 0 0
-- field SFVec3f scale 1 1 1
-- field SFInt32 state 0
-- field SFString tag "No Tag"
--] {
-- Group {
-- children [
-- # The sphere itself is here
-- DEF TS ClickSphere {
-- the_pos IS pos
-- the_scale IS scale
-- }
--
-- # The script that receives pointer
-- # events from the ClickSphere, updates
-- # the state of the SpeakSphere
-- DEF PS Script {
-- eventIn SFTime touch_function
-- eventOut SFColor col
-- field SFInt32 sstate IS state
-- field SFColor scol1 IS col1
-- field SFColor scol2 IS col2
-- field SFString stag IS tag
-- url [
-- "perl:
-- # $t is the (tied) hash that
-- # represents the Script node : the
-- # eventIn/eventOut/field are keys.
-- touch_function => sub {
--
-- $t->{sstate} ^= 1 ;
--
-- print qq{TAG:$t->{stag} STATE:$t->{sstate}}.chr(10);
--
-- # Set the eventOut 'col'
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- },
-- initialize => sub {
-- # Set initial col
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- }
-- "
-- ]
-- }
-- ]
-- }
-- # Send touch event into script and
-- # updated color into ClickSphere
-- ROUTE TS.touched TO PS.touch_function
-- ROUTE PS.col TO TS.the_color
--}
---- a/inst/data/defSpeakSphere.wrl
-+++ /dev/null
-@@ -1,88 +0,0 @@
--#VRML V2.0 utf8
--
--# Sphere whose color changes when it is touched
--#
--# Author : Etienne Grossmann <etienne at isr.ist.utl.pt>
--
--
--# A sphere with a touch sensor
--PROTO ClickSphere [
-- eventIn SFColor the_color # This event accepted (from script)
-- eventOut SFTime touched # This event emitted when touched
-- field SFVec3f the_pos 0 0 0
-- field SFVec3f the_scale 1 1 1
--] {
-- Transform {
-- translation IS the_pos
-- scale IS the_scale
-- children [
-- TouchSensor { touchTime IS touched }
--
-- Shape {
-- appearance Appearance {material Material {diffuseColor IS the_color}}
-- geometry Sphere { }
-- ## geometry Box { }
-- }
-- ]
-- }
--}
--
--# A SpeakSphere is a sphere that changes color and prints out its tag
--# and current state when clicked upon.
--#
--# Output format is : TAG:<tag> STATE:<state>
--
--PROTO SpeakSphere [
-- field SFColor col1 0.4 0.4 0.9
-- field SFColor col2 0.4 0.9 0.4
-- field SFVec3f pos 0 0 0
-- field SFVec3f scale 1 1 1
-- field SFInt32 state 0
-- field SFString tag "No Tag"
--] {
-- Group {
-- children [
-- # The sphere itself is here
-- DEF TS ClickSphere {
-- the_pos IS pos
-- the_scale IS scale
-- }
--
-- # The script that receives pointer
-- # events from the ClickSphere, updates
-- # the state of the SpeakSphere
-- DEF PS Script {
-- eventIn SFTime touch_function
-- eventOut SFColor col
-- field SFInt32 sstate IS state
-- field SFColor scol1 IS col1
-- field SFColor scol2 IS col2
-- field SFString stag IS tag
-- url [
-- "perl:
-- # $t is the (tied) hash that
-- # represents the Script node : the
-- # eventIn/eventOut/field are keys.
-- touch_function => sub {
--
-- $t->{sstate} ^= 1 ;
--
-- print qq{TAG:$t->{stag} STATE:$t->{sstate}}.chr(10);
--
-- # Set the eventOut 'col'
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- },
-- initialize => sub {
-- # Set initial col
-- $t->{col} = $t->{ $t->{sstate} ? 'scol2' : 'scol1' };
-- }
-- "
-- ]
-- }
-- ]
-- }
-- # Send touch event into script and
-- # updated color into ClickSphere
-- ROUTE TS.touched TO PS.touch_function
-- ROUTE PS.col TO TS.the_color
--}
diff --git a/debian/patches/series b/debian/patches/series
index 5bed695..e686a24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-remove_unused_files
whitedune_for_freewrl
order_boolean_operation
structure_initialization
--
Debian packaging for octave-vrml
More information about the Pkg-octave-commit
mailing list