[Pkg-cli-libs-commits] [taoframework] 49/91: Patches refreshed
Jo Shields
directhex at moszumanska.debian.org
Mon Sep 22 08:33:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to branch master
in repository taoframework.
commit 3bc42cfc570be57692d7d2090d8aa122bb2e5725
Author: David Paleino <d.paleino at gmail.com>
Date: Sat Sep 20 11:22:09 2008 +0000
Patches refreshed
---
debian/patches/201_no_resources.diff | 203 +++++++++++------------
debian/patches/202_disable_parts_of_glu_doc.diff | 21 +--
2 files changed, 103 insertions(+), 121 deletions(-)
diff --git a/debian/patches/201_no_resources.diff b/debian/patches/201_no_resources.diff
index 20a3f5f..9883b7b 100644
--- a/debian/patches/201_no_resources.diff
+++ b/debian/patches/201_no_resources.diff
@@ -1,15 +1,8 @@
-Index: tao-2.0.0.svn20071027/Tao.FFmpeg/FFmpegExamples/Player.Designer.cs
+Index: taoframework-2.1.0/source/examples/FFmpegExamples/Player.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.FFmpeg/FFmpegExamples/Player.Designer.cs 2007-10-27 12:35:30.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.FFmpeg/FFmpegExamples/Player.Designer.cs 2007-10-27 12:15:43.000000000 +0000
-@@ -95,13 +95,13 @@
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-- this.BackgroundImage = global::FFmpegExamples.Properties.Resources.RapidBaccarat_Green;
-+ //this.BackgroundImage = global::FFmpegExamples.Properties.Resources.RapidBaccarat_Green;
- this.ClientSize = new System.Drawing.Size(228, 86);
- this.Controls.Add(this.button3);
+--- taoframework-2.1.0.orig/source/examples/FFmpegExamples/Player.Designer.cs
++++ taoframework-2.1.0/source/examples/FFmpegExamples/Player.Designer.cs
+@@ -127,7 +127,7 @@
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Controls.Add(this.pnlMusicInfo);
@@ -18,107 +11,107 @@ Index: tao-2.0.0.svn20071027/Tao.FFmpeg/FFmpegExamples/Player.Designer.cs
this.MaximizeBox = false;
this.Name = "Player";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/CgExamples/CgExamples.Designer.cs
+Index: taoframework-2.1.0/source/examples/CgExamples/CgExamples.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/CgExamples/CgExamples.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/CgExamples/CgExamples.Designer.cs 2007-10-27 12:35:42.000000000 +0000
-@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "CgExamples";
- this.Text = "CgExamplesExamples";
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/GeWangExamples/GeWangExamples.Designer.cs
+--- taoframework-2.1.0.orig/source/examples/CgExamples/CgExamples.Designer.cs
++++ taoframework-2.1.0/source/examples/CgExamples/CgExamples.Designer.cs
+@@ -88,7 +88,7 @@
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "CgExamples";
+ this.Text = "CgExamplesExamples";
+Index: taoframework-2.1.0/source/examples/GeWangExamples/GeWangExamples.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/GeWangExamples/GeWangExamples.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/GeWangExamples/GeWangExamples.Designer.cs 2007-10-27 12:35:44.000000000 +0000
-@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "GeWang";
- this.Text = "GeWangExamples";
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/GlfwExamples/GlfwExamples.Designer.cs
+--- taoframework-2.1.0.orig/source/examples/GeWangExamples/GeWangExamples.Designer.cs
++++ taoframework-2.1.0/source/examples/GeWangExamples/GeWangExamples.Designer.cs
+@@ -88,7 +88,7 @@
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "GeWang";
+ this.Text = "GeWangExamples";
+Index: taoframework-2.1.0/source/examples/GlfwExamples/GlfwExamples.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/GlfwExamples/GlfwExamples.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/GlfwExamples/GlfwExamples.Designer.cs 2007-10-27 12:35:46.000000000 +0000
-@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "GlfwExamples";
- this.Text = "GlfwExamples";
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/NateRobins/NateRobins.Designer.cs
+--- taoframework-2.1.0.orig/source/examples/GlfwExamples/GlfwExamples.Designer.cs
++++ taoframework-2.1.0/source/examples/GlfwExamples/GlfwExamples.Designer.cs
+@@ -88,7 +88,7 @@
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "GlfwExamples";
+ this.Text = "GlfwExamples";
+Index: taoframework-2.1.0/source/examples/NateRobins/NateRobins.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/NateRobins/NateRobins.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/NateRobins/NateRobins.Designer.cs 2007-10-27 12:35:47.000000000 +0000
+--- taoframework-2.1.0.orig/source/examples/NateRobins/NateRobins.Designer.cs
++++ taoframework-2.1.0/source/examples/NateRobins/NateRobins.Designer.cs
@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "NateRobins";
- this.Text = "NateRobinsExamples";
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/NeHe/NeHe.Designer.cs
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "NateRobins";
+ this.Text = "NateRobinsExamples";
+Index: taoframework-2.1.0/source/examples/NeHe/NeHe.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/NeHe/NeHe.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/NeHe/NeHe.Designer.cs 2007-10-27 12:35:49.000000000 +0000
-@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "NeHe";
- this.Text = "NeHeExamples";
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/OpenAlExamples/OpenAlExamples.Designer.cs
+--- taoframework-2.1.0.orig/source/examples/NeHe/NeHe.Designer.cs
++++ taoframework-2.1.0/source/examples/NeHe/NeHe.Designer.cs
+@@ -88,7 +88,7 @@
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "NeHe";
+ this.Text = "NeHeExamples";
+Index: taoframework-2.1.0/source/examples/OpenAlExamples/OpenAlExamples.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/OpenAlExamples/OpenAlExamples.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/OpenAlExamples/OpenAlExamples.Designer.cs 2007-10-27 12:35:50.000000000 +0000
+--- taoframework-2.1.0.orig/source/examples/OpenAlExamples/OpenAlExamples.Designer.cs
++++ taoframework-2.1.0/source/examples/OpenAlExamples/OpenAlExamples.Designer.cs
@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "OpenAlExamples";
- this.Text = "OpenAlExamplesExamples";
-Index: tao-2.0.0.svn20071027/Tao.OpenGl/Redbook/Redbook.Designer.cs
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "OpenAlExamples";
+ this.Text = "OpenAlExamplesExamples";
+Index: taoframework-2.1.0/source/examples/Redbook/Redbook.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.OpenGl/Redbook/Redbook.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.OpenGl/Redbook/Redbook.Designer.cs 2007-10-27 12:35:52.000000000 +0000
-@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "Redbook";
- this.Text = "RedbookExamples";
-Index: tao-2.0.0.svn20071027/Tao.Sdl/SdlExamples/SdlExamples.Designer.cs
+--- taoframework-2.1.0.orig/source/examples/Redbook/Redbook.Designer.cs
++++ taoframework-2.1.0/source/examples/Redbook/Redbook.Designer.cs
+@@ -88,7 +88,7 @@
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "Redbook";
+ this.Text = "RedbookExamples";
+Index: taoframework-2.1.0/source/examples/SdlExamples/SdlExamples.Designer.cs
===================================================================
---- tao-2.0.0.svn20071027.orig/Tao.Sdl/SdlExamples/SdlExamples.Designer.cs 2007-10-27 12:34:45.000000000 +0000
-+++ tao-2.0.0.svn20071027/Tao.Sdl/SdlExamples/SdlExamples.Designer.cs 2007-10-27 12:35:54.000000000 +0000
-@@ -61,7 +61,7 @@
- this.Controls.Add(this.btnRun);
- this.Controls.Add(this.lstExamples);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-+ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
- this.Name = "SdlExamples";
- this.Text = "SdlExamplesExamples";
+--- taoframework-2.1.0.orig/source/examples/SdlExamples/SdlExamples.Designer.cs
++++ taoframework-2.1.0/source/examples/SdlExamples/SdlExamples.Designer.cs
+@@ -88,7 +88,7 @@
+ this.Controls.Add(this.btnRun);
+ this.Controls.Add(this.lstExamples);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++ //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "SdlExamples";
+ this.Text = "SdlExamplesExamples";
diff --git a/debian/patches/202_disable_parts_of_glu_doc.diff b/debian/patches/202_disable_parts_of_glu_doc.diff
index ce930d5..b63e3a6 100644
--- a/debian/patches/202_disable_parts_of_glu_doc.diff
+++ b/debian/patches/202_disable_parts_of_glu_doc.diff
@@ -1,7 +1,7 @@
-Index: taoframework-2.0.0.svn20071027/Tao.OpenGl/Tao.OpenGl/Glu.cs
+Index: taoframework-2.1.0/source/src/Tao.OpenGl/Glu.cs
===================================================================
---- taoframework-2.0.0.svn20071027.orig/Tao.OpenGl/Tao.OpenGl/Glu.cs 2008-08-19 10:46:37.000000000 +0000
-+++ taoframework-2.0.0.svn20071027/Tao.OpenGl/Tao.OpenGl/Glu.cs 2008-08-19 10:46:50.000000000 +0000
+--- taoframework-2.1.0.orig/source/src/Tao.OpenGl/Glu.cs
++++ taoframework-2.1.0/source/src/Tao.OpenGl/Glu.cs
@@ -1498,118 +1498,118 @@
// --- Public Delegates ---
@@ -173,7 +173,7 @@ Index: taoframework-2.0.0.svn20071027/Tao.OpenGl/Tao.OpenGl/Glu.cs
// void vertexData(GLfloat *vertex, void *userData);
public delegate void NurbsVertexDataCallback([In] float[] vertexData, [In] IntPtr[] userData);
#endregion NurbsVertexDataCallback([In] float[] vertexData, [In] IntPtr[] userData)
-@@ -1624,127 +1624,127 @@
+@@ -1624,55 +1624,55 @@
#endregion QuadricErrorCallback(int errorCode)
#region TessBeginCallback(int type)
@@ -253,18 +253,7 @@ Index: taoframework-2.0.0.svn20071027/Tao.OpenGl/Tao.OpenGl/Glu.cs
// typedef void (CALLBACK* GLUtessEdgeFlagProc) (GLboolean);
public delegate void TessEdgeFlagCallback(int flag);
#endregion TessEdgeFlagCallback(int flag)
-
- #region TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluTessCallback(Tao.OpenGl.Glu.GLUtesselator, int, Tao.OpenGl.Glu.TessBeginCallback)" />
- // typedef void (CALLBACK* GLUtessEdgeFlagDataProc) (GLboolean, void *);
- public delegate void TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData);
+@@ -1687,64 +1687,64 @@
#endregion TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData)
#region TessEndCallback()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git
More information about the Pkg-cli-libs-commits
mailing list