[Pkg-mono-svn-commits] rev 3407 - in tao/trunk/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Sun Oct 28 13:13:47 UTC 2007 

Author: sho
Date: 2007-10-28 13:13:46 +0000 (Sun, 28 Oct 2007)
New Revision: 3407

Added:
   tao/trunk/debian/libtao-ffmpeg1-cil.install
   tao/trunk/debian/libtao-ffmpeg1-cil.installcligac
   tao/trunk/debian/libtao-ffmpeg1-cil.links
   tao/trunk/debian/patches/
   tao/trunk/debian/patches/100_nunit_pkg_config.diff
   tao/trunk/debian/patches/200_dllimport_attributes.diff
   tao/trunk/debian/patches/201_no_resources.diff
   tao/trunk/debian/patches/300_proper_dll_config.diff
   tao/trunk/debian/patches/series
   tao/trunk/debian/tao-ffmpeg-1.pc
Removed:
   tao/trunk/debian/tao-opengl-glu-1.5.pc
Modified:
   tao/trunk/debian/
   tao/trunk/debian/changelog
   tao/trunk/debian/control
   tao/trunk/debian/libtao-cil-examples.examples
   tao/trunk/debian/libtao-devil1.6-cil.install
   tao/trunk/debian/libtao-freeglut2.4-cil.install
   tao/trunk/debian/libtao-ode0.5-cil.install
   tao/trunk/debian/libtao-openal1.1-cil.install
   tao/trunk/debian/libtao-opengl1.5-cil.install
   tao/trunk/debian/libtao-opengl1.5-cil.installcligac
   tao/trunk/debian/libtao-opengl1.5-cil.links
   tao/trunk/debian/libtao-physfs1.0-cil.install
   tao/trunk/debian/libtao-physfs1.0-cil.installcligac
   tao/trunk/debian/libtao-sdl1.2-cil.install
   tao/trunk/debian/monodoc-tao-manual.install
   tao/trunk/debian/rules
   tao/trunk/debian/tao-freeglut-2.4.pc
   tao/trunk/debian/tao-openal-1.1.pc
   tao/trunk/debian/tao-opengl-1.5.pc
   tao/trunk/debian/tao-physfs-1.0.pc
Log:
tao (2.0.0.svn20071027-1) UNRELEASED; urgency=low

  [ Dylan R. E. Moonfire and Sebastian Dr?\195?\182ge ]

  * Initial 1.3.0 package. (Closes: #344685)

  [ Sam Hocevar ]

  * New upstream snapshot.
  * Use quilt for patch management.
  * Added myself to the list of uploaders.

  * debian/patches/100_nunit_pkg_config.diff:
    + New patch. Use the proper patch to nunit?\226?\128?\153s dll.

  * debian/patches/200_dllimport_attributes.diff:
    + New patch. Add proper dllimport attributes here and there.

  * debian/patches/201_no_resources.diff:
    + New patch. Icons and resources fail to load in examples. Just ignore
      them.

  * debian/patches/300_proper_dll_config.diff:
    + New patch. Fix .dll.config files that no longer match the Debian
      versions of the libraries.



Property changes on: tao/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: tao/trunk/debian/changelog
===================================================================
--- tao/trunk/debian/changelog	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/changelog	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,6 +1,28 @@
-tao (1.3.0-1-1) unstable; urgency=low
+tao (2.0.0.svn20071027-1) UNRELEASED; urgency=low
 
-  - Dylan R. E. Moonfire and Sebastian Dröge
-    * Initial package. (Closes: #344685)
+  [ Dylan R. E. Moonfire and Sebastian Dröge ]
 
- -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Thu, 28 Sep 2006 16:59:10 -0500
+  * Initial 1.3.0 package. (Closes: #344685)
+
+  [ Sam Hocevar ]
+
+  * New upstream snapshot.
+  * Use quilt for patch management.
+  * Added myself to the list of uploaders.
+
+  * debian/patches/100_nunit_pkg_config.diff:
+    + New patch. Use the proper patch to nunit’s dll.
+
+  * debian/patches/200_dllimport_attributes.diff:
+    + New patch. Add proper dllimport attributes here and there.
+
+  * debian/patches/201_no_resources.diff:
+    + New patch. Icons and resources fail to load in examples. Just ignore
+      them.
+
+  * debian/patches/300_proper_dll_config.diff:
+    + New patch. Fix .dll.config files that no longer match the Debian
+      versions of the libraries.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 28 Oct 2007 13:54:26 +0100
+

Modified: tao/trunk/debian/control
===================================================================
--- tao/trunk/debian/control	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/control	2007-10-28 13:13:46 UTC (rev 3407)
@@ -2,9 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>, Dylan R. E. Moonfire <debian at mfgames.com>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: cli-common-dev (>= 0.4.0), mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libsmpeg-dev, libode0-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-xorg-dev | libglu1-dev, xlibmesa-gl-dev | libgl1-mesa-dev, monodoc-base
+Uploaders: Sebastian Dröge <slomo at debian.org>, Dylan R. E. Moonfire <debian at mfgames.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Build-Depends: debhelper (>= 5), quilt
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-gmcs, libmono-dev, libopenal-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libsmpeg-dev, libode0-dev, libdevil-dev, libphysfs-dev, freeglut3-dev, libglu1-xorg-dev | libglu1-dev, xlibmesa-gl-dev | libgl1-mesa-dev, monodoc-base
 Standards-Version: 3.7.2
 
 Package: libtao-cil-examples
@@ -135,6 +135,20 @@
  http://www.mono-project.com/Tao
  http://icculus.org/physfs
 
+Package: libtao-ffmpeg1-cil
+Architecture: all
+Depends: ${cli:Depends}
+Description: Tao CLI binding for FFmpeg
+ The Tao Framework is a collection of bindings and libraries to
+ facilitate cross-platform games-related development utilizing the Mono
+ and .NET platforms.
+ .
+ The FFmpeg libraries support most existing file formats (AVI, MPEG, OGG,
+ Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+ .
+ http://www.mono-project.com/Tao
+ http://ffmpeg.mplayerhq.hu/
+
 Package: monodoc-tao-manual
 Architecture: all
 Section: doc

Modified: tao/trunk/debian/libtao-cil-examples.examples
===================================================================
--- tao/trunk/debian/libtao-cil-examples.examples	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-cil-examples.examples	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,9 +1 @@
-source/dist/examples/Data
-source/dist/examples/DevIlExamples.*
-source/dist/examples/GeWang.*
-source/dist/examples/NateRobbins.*
-source/dist/examples/OdeExamples.*
-source/dist/examples/OpenAlExamples.*
-source/dist/examples/PhysFsExamples.*
-source/dist/examples/Redbook.*
-source/dist/examples/SdlExamples.*
+build/examples/*

Modified: tao/trunk/debian/libtao-devil1.6-cil.install
===================================================================
--- tao/trunk/debian/libtao-devil1.6-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-devil1.6-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
 debian/tao-devil-1.6.pc			/usr/lib/pkgconfig/
-source/dist/bin/Tao.DevIl.dll		/usr/lib/cli/tao-devil-1.6/
-debian/Tao.DevIl.dll.config		/usr/lib/cli/tao-devil-1.6/
+build/Tao.DevIl.dll			/usr/lib/cli/tao-devil-1.6/
+build/Tao.DevIl.dll.config		/usr/lib/cli/tao-devil-1.6/

Added: tao/trunk/debian/libtao-ffmpeg1-cil.install
===================================================================
--- tao/trunk/debian/libtao-ffmpeg1-cil.install	                        (rev 0)
+++ tao/trunk/debian/libtao-ffmpeg1-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,3 @@
+debian/tao-ffmpeg-1.pc			/usr/lib/pkgconfig/
+build/Tao.FFmpeg.dll			/usr/lib/cli/tao-ffmpeg-1/
+build/Tao.FFmpeg.dll.config		/usr/lib/cli/tao-ffmpeg-1/

Added: tao/trunk/debian/libtao-ffmpeg1-cil.installcligac
===================================================================
--- tao/trunk/debian/libtao-ffmpeg1-cil.installcligac	                        (rev 0)
+++ tao/trunk/debian/libtao-ffmpeg1-cil.installcligac	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1 @@
+/usr/lib/cli/tao-ffmpeg-1/Tao.FFmpeg.dll

Added: tao/trunk/debian/libtao-ffmpeg1-cil.links
===================================================================
--- tao/trunk/debian/libtao-ffmpeg1-cil.links	                        (rev 0)
+++ tao/trunk/debian/libtao-ffmpeg1-cil.links	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1 @@
+usr/lib/pkgconfig/tao-ffmpeg-1.pc usr/lib/pkgconfig/tao-ffmpeg.pc

Modified: tao/trunk/debian/libtao-freeglut2.4-cil.install
===================================================================
--- tao/trunk/debian/libtao-freeglut2.4-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-freeglut2.4-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
 debian/tao-freeglut-2.4.pc		/usr/lib/pkgconfig/
-source/dist/bin/Tao.FreeGlut.dll	/usr/lib/cli/tao-freeglut-2.4/
-debian/Tao.FreeGlut.dll.config		/usr/lib/cli/tao-freeglut-2.4/
+build/Tao.FreeGlut.dll			/usr/lib/cli/tao-freeglut-2.4/
+build/Tao.FreeGlut.dll.config		/usr/lib/cli/tao-freeglut-2.4/

Modified: tao/trunk/debian/libtao-ode0.5-cil.install
===================================================================
--- tao/trunk/debian/libtao-ode0.5-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-ode0.5-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
 debian/tao-ode-0.5.pc			/usr/lib/pkgconfig/
-source/dist/bin/Tao.Ode.dll		/usr/lib/cli/tao-ode-0.5/
-debian/Tao.Ode.dll.config		/usr/lib/cli/tao-ode-0.5/
+build/Tao.Ode.dll			/usr/lib/cli/tao-ode-0.5/
+build/Tao.Ode.dll.config		/usr/lib/cli/tao-ode-0.5/

Modified: tao/trunk/debian/libtao-openal1.1-cil.install
===================================================================
--- tao/trunk/debian/libtao-openal1.1-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-openal1.1-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
 debian/tao-openal-1.1.pc		/usr/lib/pkgconfig/
-source/dist/bin/Tao.OpenAl.dll		/usr/lib/cli/tao-openal-1.1/
-debian/Tao.OpenAl.dll.config		/usr/lib/cli/tao-openal-1.1/
+build/Tao.OpenAl.dll			/usr/lib/cli/tao-openal-1.1/
+build/Tao.OpenAl.dll.config		/usr/lib/cli/tao-openal-1.1/

Modified: tao/trunk/debian/libtao-opengl1.5-cil.install
===================================================================
--- tao/trunk/debian/libtao-opengl1.5-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-opengl1.5-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,8 +1,5 @@
-debian/tao-opengl-1.5.pc				/usr/lib/pkgconfig/
-debian/tao-opengl-glu-1.5.pc				/usr/lib/pkgconfig/
-source/dist/bin/Tao.OpenGl.dll				/usr/lib/cli/tao-opengl-1.5/
-debian/Tao.OpenGl.dll.config			/usr/lib/cli/tao-opengl-1.5/
-source/dist/bin/Tao.OpenGl.ExtensionLoader.dll		/usr/lib/cli/tao-opengl-1.5/
-debian/Tao.OpenGl.ExtensionLoader.dll.config	/usr/lib/cli/tao-opengl-1.5/
-source/dist/bin/Tao.OpenGl.Glu.dll			/usr/lib/cli/tao-opengl-1.5/
-debian/Tao.OpenGl.Glu.dll.config		/usr/lib/cli/tao-opengl-1.5/
+debian/tao-opengl-1.5.pc			/usr/lib/pkgconfig/
+build/Tao.OpenGl.dll				/usr/lib/cli/tao-opengl-1.5/
+build/Tao.OpenGl.dll.config			/usr/lib/cli/tao-opengl-1.5/
+build/Tao.Platform.X11.dll			/usr/lib/cli/tao-opengl-1.5/
+build/Tao.Platform.X11.dll.config		/usr/lib/cli/tao-opengl-1.5/

Modified: tao/trunk/debian/libtao-opengl1.5-cil.installcligac
===================================================================
--- tao/trunk/debian/libtao-opengl1.5-cil.installcligac	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-opengl1.5-cil.installcligac	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,2 @@
 /usr/lib/cli/tao-opengl-1.5/Tao.OpenGl.dll
-/usr/lib/cli/tao-opengl-1.5/Tao.OpenGl.ExtensionLoader.dll
-/usr/lib/cli/tao-opengl-1.5/Tao.OpenGl.Glu.dll
+/usr/lib/cli/tao-opengl-1.5/Tao.Platform.X11.dll

Modified: tao/trunk/debian/libtao-opengl1.5-cil.links
===================================================================
--- tao/trunk/debian/libtao-opengl1.5-cil.links	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-opengl1.5-cil.links	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,2 +1 @@
 usr/lib/pkgconfig/tao-opengl-1.5.pc     usr/lib/pkgconfig/tao-opengl.pc
-usr/lib/pkgconfig/tao-opengl-glu-1.5.pc usr/lib/pkgconfig/tao-opengl-glu.pc

Modified: tao/trunk/debian/libtao-physfs1.0-cil.install
===================================================================
--- tao/trunk/debian/libtao-physfs1.0-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-physfs1.0-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
 debian/tao-physfs-1.0.pc		/usr/lib/pkgconfig/
-source/dist/bin/Tao.PhysFs.dll		/usr/lib/cli/tao-phyfs-1.0/
-debian/Tao.PhysFs.dll.config	/usr/lib/cli/tao-phyfs-1.0/
+build/Tao.PhysFs.dll			/usr/lib/cli/tao-physfs-1.0/
+build/Tao.PhysFs.dll.config		/usr/lib/cli/tao-physfs-1.0/

Modified: tao/trunk/debian/libtao-physfs1.0-cil.installcligac
===================================================================
--- tao/trunk/debian/libtao-physfs1.0-cil.installcligac	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-physfs1.0-cil.installcligac	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1 +1 @@
-/usr/lib/cli/tao-phyfs-1.0/Tao.PhysFs.dll
+/usr/lib/cli/tao-physfs-1.0/Tao.PhysFs.dll

Modified: tao/trunk/debian/libtao-sdl1.2-cil.install
===================================================================
--- tao/trunk/debian/libtao-sdl1.2-cil.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/libtao-sdl1.2-cil.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
 debian/tao-sdl-1.2.pc			/usr/lib/pkgconfig/
-source/dist/bin/Tao.Sdl.dll		/usr/lib/cli/tao-sdl-1.2/
-debian/Tao.Sdl.dll.config	/usr/lib/cli/tao-sdl-1.2/
+build/Tao.Sdl.dll			/usr/lib/cli/tao-sdl-1.2/
+build/Tao.Sdl.dll.config		/usr/lib/cli/tao-sdl-1.2/

Modified: tao/trunk/debian/monodoc-tao-manual.install
===================================================================
--- tao/trunk/debian/monodoc-tao-manual.install	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/monodoc-tao-manual.install	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,3 +1,3 @@
-dist/doc/Tao.tree	/usr/lib/monodoc/sources/
-dist/doc/Tao.zip	/usr/lib/monodoc/sources/
+build/doc/Tao.tree	/usr/lib/monodoc/sources/
+build/doc/Tao.zip	/usr/lib/monodoc/sources/
 debian/Tao.source	/usr/lib/monodoc/sources/

Added: tao/trunk/debian/patches/100_nunit_pkg_config.diff
===================================================================
--- tao/trunk/debian/patches/100_nunit_pkg_config.diff	                        (rev 0)
+++ tao/trunk/debian/patches/100_nunit_pkg_config.diff	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,13 @@
+Index: tao-2.0.0.svn20071026/Tao.Sdl/Tao.Sdl.Tests/Makefile.in
+===================================================================
+--- tao-2.0.0.svn20071026.orig/Tao.Sdl/Tao.Sdl.Tests/Makefile.in	2007-10-26 14:06:56.000000000 +0000
++++ tao-2.0.0.svn20071026/Tao.Sdl/Tao.Sdl.Tests/Makefile.in	2007-10-26 14:07:47.000000000 +0000
+@@ -182,7 +182,7 @@
+ 
+ SYSTEM_LIBS = \
+ 	System \
+-	nunit.framework
++	/usr/lib/cli/nunit-2.2.6/nunit.framework.dll
+ 
+ RESOURCES = 
+ SOURCES = \

Added: tao/trunk/debian/patches/200_dllimport_attributes.diff
===================================================================
--- tao/trunk/debian/patches/200_dllimport_attributes.diff	                        (rev 0)
+++ tao/trunk/debian/patches/200_dllimport_attributes.diff	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,36 @@
+Index: tao-2.0.0.svn20071026/Tao.OpenGl/Tao.Platform.X11/Glx.cs
+===================================================================
+--- tao-2.0.0.svn20071026.orig/Tao.OpenGl/Tao.Platform.X11/Glx.cs	2007-10-27 09:36:48.000000000 +0000
++++ tao-2.0.0.svn20071026/Tao.OpenGl/Tao.Platform.X11/Glx.cs	2007-10-27 09:36:52.000000000 +0000
+@@ -920,6 +920,7 @@
+         /// <param name="eventBase"></param>
+         /// <returns></returns>
+         [CLSCompliant(false)]
++		[DllImport( LIBGL, CallingConvention = CALLING_CONVENTION, EntryPoint = "glXQueryExtension" ), SuppressUnmanagedCodeSecurity]
+ 		public static unsafe extern bool glXQueryExtension( IntPtr dpy, int* errorBase, int* eventBase );
+ 
+         /// <summary>
+@@ -988,6 +989,7 @@
+         /// <param name="minor"></param>
+         /// <returns></returns>
+         [CLSCompliant(false)]
++		[DllImport( LIBGL, CallingConvention = CALLING_CONVENTION, EntryPoint = "glXQueryVersion" ), SuppressUnmanagedCodeSecurity]
+ 		public static unsafe extern bool glXQueryVersion( IntPtr dpy, int* major, int* minor );
+ 		//public static unsafe extern bool glXQueryVersion( IntPtr dpy, out int major, out int minor )
+ 		//{
+@@ -1309,6 +1311,7 @@
+         /// <param name="attribute"></param>
+         /// <param name="value"></param>
+         [CLSCompliant(false)]
++		[DllImport( LIBGL, CallingConvention = CALLING_CONVENTION, EntryPoint = "glXQueryDrawable" ), SuppressUnmanagedCodeSecurity]
+ 		public static extern void glXQueryDrawable( IntPtr dpy, IntPtr draw, int attribute, uint[] value );
+ 
+ 		/// <summary>
+@@ -1415,6 +1418,7 @@
+         /// <param name="draw"></param>
+         /// <param name="event_mask"></param>
+         [CLSCompliant(false)]
++        [DllImport( LIBGL, CallingConvention = CALLING_CONVENTION, EntryPoint = "glXGetSelectedEvent" ), SuppressUnmanagedCodeSecurity]
+         public static unsafe extern void glXGetSelectedEvent( IntPtr dpy, IntPtr draw, ulong event_mask );
+ 
+ 		/* GLX 1.4 and later */

Added: tao/trunk/debian/patches/201_no_resources.diff
===================================================================
--- tao/trunk/debian/patches/201_no_resources.diff	                        (rev 0)
+++ tao/trunk/debian/patches/201_no_resources.diff	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,124 @@
+Index: tao-2.0.0.svn20071027/Tao.FFmpeg/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);
+             this.Controls.Add(this.button2);
+             this.Controls.Add(this.button1);
+             this.Controls.Add(this.pnlMusicInfo);
+-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
++            //this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+             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
+===================================================================
+--- 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
+===================================================================
+--- 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
+===================================================================
+--- 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
+===================================================================
+--- 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
+@@ -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
+===================================================================
+--- 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
+===================================================================
+--- 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
+@@ -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
+===================================================================
+--- 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
+===================================================================
+--- 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";

Added: tao/trunk/debian/patches/300_proper_dll_config.diff
===================================================================
--- tao/trunk/debian/patches/300_proper_dll_config.diff	                        (rev 0)
+++ tao/trunk/debian/patches/300_proper_dll_config.diff	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,9 @@
+Index: tao-2.0.0.svn20071026/Tao.Ode/Tao.Ode/Tao.Ode.dll.config
+===================================================================
+--- tao-2.0.0.svn20071026.orig/Tao.Ode/Tao.Ode/Tao.Ode.dll.config	2007-10-27 09:37:06.000000000 +0000
++++ tao-2.0.0.svn20071026/Tao.Ode/Tao.Ode/Tao.Ode.dll.config	2007-10-27 09:37:11.000000000 +0000
+@@ -1,3 +1,3 @@
+ <configuration>
+-    <dllmap dll="ode.dll" target="libode.so.0" />
++    <dllmap dll="ode.dll" target="libode.so.0debian1" />
+ </configuration>

Added: tao/trunk/debian/patches/series
===================================================================
--- tao/trunk/debian/patches/series	                        (rev 0)
+++ tao/trunk/debian/patches/series	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,4 @@
+100_nunit_pkg_config.diff
+200_dllimport_attributes.diff
+201_no_resources.diff
+300_proper_dll_config.diff

Modified: tao/trunk/debian/rules
===================================================================
--- tao/trunk/debian/rules	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/rules	2007-10-28 13:13:46 UTC (rev 3407)
@@ -7,43 +7,50 @@
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,' | sed 's,+.*,,')
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 
+BUILDDIRS = OpenGl DevIl FFmpeg Lua Ode PhysFs Sdl
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	$(MAKE) -C source mono-1.1
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	for builddir in $(BUILDDIRS); do \
+	  (cd Tao.$$builddir && ./configure) || exit 1; \
+	done
 	touch configure-stamp
 
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	$(MAKE) -C source STRONG=1
-
+	for builddir in $(BUILDDIRS); do \
+	  (cd Tao.$$builddir && $(MAKE)) || exit 1; \
+	done
 	# Build the documentation and also copy the .config files to a
 	# place that dh_install can use.
-	-mkdir -p $(CURDIR)/dist/doc/monodocer
-	for file in Tao.DevIl Tao.FreeGlut Tao.Ode Tao.OpenAl \
-		Tao.OpenGl Tao.OpenGl.ExtensionLoader Tao.OpenGl.Glu \
-		Tao.Sdl Tao.PhysFs; do \
-		/usr/bin/monodocer \
-			--assembly:$(CURDIR)/source/dist/bin/$$file.dll \
-			--path:$(CURDIR)/dist/doc/monodocer/$$file; \
-		cp source/src/$$file/$$file.dll.config.debian \
-			debian/$$file.dll.config; \
+	mkdir -p $(CURDIR)/build/doc/tmp
+	mkdir -p $(CURDIR)/build/examples
+	for dir in $(shell find -maxdepth 2 -wholename './Tao.*/Tao.*' -type d | grep -v '\(Cg\|Tests\|Windows\)'); do \
+	  /usr/bin/monodocer --assembly:$(CURDIR)/$$dir/$${dir##*/}.dll \
+                             --path:$(CURDIR)/build/doc/tmp/$${dir##*/}; \
+	  cp $(CURDIR)/$$dir/$${dir##*/}.dll \
+	     $(CURDIR)/$$dir/$${dir##*/}.dll.config \
+	     $(CURDIR)/build/; \
 	done
-
+	# $(patsubst) and $(wildcard) would have been elegant here, but for
+	# some reason they are not expanded when called by svn-buildpackage
+	# (while perfectly working upon manual invokation of debian/rules)
 	/usr/bin/mdassembler \
-		--out $(CURDIR)/dist/doc/Tao \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.DevIl \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.FreeGlut \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.Ode \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.OpenAl \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.OpenGl \
-	       --ecma $(CURDIR)/dist/doc/monodocer/Tao.OpenGl.ExtensionLoader \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.OpenGl.Glu \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.PhysFs \
-		--ecma $(CURDIR)/dist/doc/monodocer/Tao.Sdl
-
-	# Finish up
+		--out $(CURDIR)/build/doc/Tao \
+		$$(find $(CURDIR)/build/doc/tmp/ -mindepth 1 -maxdepth 1 | xargs printf '--ecma %s ')
+	# Copy examples contents
+	for dir in $(shell find -maxdepth 2 -type d | grep '\(Examples\|NateRobins\|NeHe\|Redbook\)'); do \
+	  mkdir -p $(CURDIR)/build/examples/$${dir##*/}; \
+	  cp -r $(CURDIR)/$$dir/*.cs \
+	        $(CURDIR)/build/examples/$${dir##*/}/; \
+	  for subdir in Properties Data Resources; do \
+	    [ ! -d $(CURDIR)/$$dir/$$subdir ] || cp $(CURDIR)/$$dir/$$subdir \
+	         $(CURDIR)/build/examples/$${dir##*/}/; \
+	  done; \
+	done
 	touch build-stamp
 
 clean:
@@ -51,11 +58,11 @@
 	dh_testroot
 	rm -f debian/*.config
 	rm -f build-stamp configure-stamp
-	rm -rf $(CURDIR)/.wapi
-	rm -rf $(CURDIR)/dist
-	rm -rf dist obj
-	rm -f config.mk
-	-$(MAKE) -C source clean
+	rm -rf $(CURDIR)/build
+	for builddir in $(BUILDDIRS); do \
+	  (cd Tao.$$builddir && [ ! -f Makefile ] || $(MAKE) distclean) || exit 1; \
+	done
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean 
 
 install: build
@@ -64,6 +71,9 @@
 	dh_clean -k 
 	dh_installdirs
 
+binary-arch:
+	# Do nothing
+
 binary-indep: build install
 	dh_testdir
 	dh_testroot

Added: tao/trunk/debian/tao-ffmpeg-1.pc
===================================================================
--- tao/trunk/debian/tao-ffmpeg-1.pc	                        (rev 0)
+++ tao/trunk/debian/tao-ffmpeg-1.pc	2007-10-28 13:13:46 UTC (rev 3407)
@@ -0,0 +1,8 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+Name: Tao.FFmpeg
+Description: FFmpeg portion of the Tao framework
+Version: 51.38.0
+Libs:  -r:${libdir}/cli/tao-ffmpeg-1/Tao.FFmpeg.dll

Modified: tao/trunk/debian/tao-freeglut-2.4.pc
===================================================================
--- tao/trunk/debian/tao-freeglut-2.4.pc	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/tao-freeglut-2.4.pc	2007-10-28 13:13:46 UTC (rev 3407)
@@ -6,4 +6,4 @@
 Description: FreeGlut portion of the Tao framework
 Version: 2.4.0.0
 Requires: tao-opengl-1.5
-Libs: -r:${libdir}/cli/tao-freeglut-2.2/Tao.FreeGlut.dll
+Libs: -r:${libdir}/cli/tao-freeglut-2.4/Tao.FreeGlut.dll

Modified: tao/trunk/debian/tao-openal-1.1.pc
===================================================================
--- tao/trunk/debian/tao-openal-1.1.pc	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/tao-openal-1.1.pc	2007-10-28 13:13:46 UTC (rev 3407)
@@ -5,4 +5,4 @@
 Name: Tao.OpenAl
 Description: OpenAl portion of Tao framework
 Version: 1.1.0.0
-Libs:  -r:${libdir}/cli/tao-openal-1.0/Tao.OpenAl.dll
+Libs:  -r:${libdir}/cli/tao-openal-1.1/Tao.OpenAl.dll

Modified: tao/trunk/debian/tao-opengl-1.5.pc
===================================================================
--- tao/trunk/debian/tao-opengl-1.5.pc	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/tao-opengl-1.5.pc	2007-10-28 13:13:46 UTC (rev 3407)
@@ -5,4 +5,4 @@
 Name: Tao.OpenGl
 Description: OpenGL section of the Tao framework
 Version: 1.5.0.3
-Libs: -r:${libdir}/cli/tao-opengl-1.5/Tao.OpenGl.dll -r:${libdir}/cli/tao-opengl-1.5/Tao.OpenGl.ExtensionLoader.dll
+Libs: -r:${libdir}/cli/tao-opengl-1.5/Tao.OpenGl.dll -r:${libdir}/cli/tao-opengl-1.5/Tao.Platform.X11.dll

Deleted: tao/trunk/debian/tao-opengl-glu-1.5.pc
===================================================================
--- tao/trunk/debian/tao-opengl-glu-1.5.pc	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/tao-opengl-glu-1.5.pc	2007-10-28 13:13:46 UTC (rev 3407)
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.OpenGl.Glu
-Description: OpenGL.Glu section of the Tao framework
-Version: 1.5.0.3
-Requires: tao-opengl-1.5
-Libs: -r:${libdir}/cli/tao-opengl-1.5/Tao.OpenGl.Glu.dll

Modified: tao/trunk/debian/tao-physfs-1.0.pc
===================================================================
--- tao/trunk/debian/tao-physfs-1.0.pc	2007-10-21 19:07:02 UTC (rev 3406)
+++ tao/trunk/debian/tao-physfs-1.0.pc	2007-10-28 13:13:46 UTC (rev 3407)
@@ -5,4 +5,4 @@
 Name: Tao.PhysFs
 Description: PhysFs section of the Tao framework
 Version: 1.0.1.0
-Libs: -r:${libdir}/cli/tao-phyfs-1.0/Tao.PhysFs.dll
+Libs: -r:${libdir}/cli/tao-physfs-1.0/Tao.PhysFs.dll

More information about the Pkg-mono-svn-commits mailing list