[Pkg-octave-commit] [SCM] octave-vrml branch, master, updated. 1.0.10-1-11-g12783b1

[Thomas Weber]

The following commit has been merged in the master branch:
commit 49f6980fa33574b32ae67ac0a39e23983da0b2f3
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat May 1 19:45:27 2010 +0200

    Drop patch pass-tests-with-octave-3.2

diff --git a/debian/changelog b/debian/changelog
index c5f0f65..450b9ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ octave-vrml (1.0.11-1) UNRELEASED; urgency=low
     - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
   * Bump standards version to 3.8.4, no changes needed
   * Switch to dpkg-source 3.0 (quilt) format
+  * Drop patch pass-tests-with-octave-3.2, applied upstream
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:00:01 +0100
 
diff --git a/debian/patches/pass-tests-with-octave-3.2 b/debian/patches/pass-tests-with-octave-3.2
deleted file mode 100644
index 7b5259e..0000000
--- a/debian/patches/pass-tests-with-octave-3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow tests to pass with Octave 3.2
-This is upstream revision 6030
---- a/inst/vrml_DirectionalLight.m
-+++ b/inst/vrml_DirectionalLight.m
-@@ -42,8 +42,8 @@
-     end
- 
-     body = [body,\
--	    sprintf ("   %-20s   %s\n",key, 
--		     sprintf (getfield (tpl,key), val))];
-+	    sprintf("   %-20s   %s\n",key,
-+		     sprintf(getfield (tpl,key), val))];
-   end
- end
- s = sprintf ("DirectionalLight { \n%s}\n", body);
diff --git a/debian/patches/series b/debian/patches/series
index 6a0fdcb..89821a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pass-tests-with-octave-3.2
 whitedune_for_freewrl

-- 
octave-vrml