[Pkg-cli-libs-commits] [taoframework] 52/91: taoframework (2.1.svn20090213-1) UNRELEASED; urgency=low * Made the build system work with the new upstream release.
Jo Shields
directhex at moszumanska.debian.org
Mon Sep 22 08:33:21 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 fb63466939964f77b6a78cb8da40278a447ef5ff
Author: Sam Hocevar <sam at zoy.org>
Date: Fri Feb 13 18:18:19 2009 +0000
taoframework (2.1.svn20090213-1) UNRELEASED; urgency=low
* Made the build system work with the new upstream release.
---
debian/changelog | 10 +-
debian/control | 10 +-
debian/libtaoframework-devil1.6-cil.install | 5 +-
debian/libtaoframework-devil1.6-cil.links | 1 -
debian/libtaoframework-ffmpeg0.4-cil.install | 5 +-
debian/libtaoframework-ffmpeg0.4-cil.links | 1 -
debian/libtaoframework-freeglut2.4-cil.install | 5 +-
debian/libtaoframework-freeglut2.4-cil.links | 1 -
debian/libtaoframework-lua5.1-cil.install | 5 +-
debian/libtaoframework-lua5.1-cil.links | 1 -
debian/libtaoframework-ode0.6-cil.install | 3 -
debian/libtaoframework-ode0.6-cil.installcligac | 1 -
debian/libtaoframework-ode0.6-cil.links | 1 -
debian/libtaoframework-ode0.9-cil.install | 2 +
debian/libtaoframework-ode0.9-cil.installcligac | 1 +
debian/libtaoframework-openal1.1-cil.install | 5 +-
debian/libtaoframework-openal1.1-cil.links | 1 -
debian/libtaoframework-opengl2.1-cil.install | 5 -
debian/libtaoframework-opengl2.1-cil.installcligac | 2 -
debian/libtaoframework-opengl2.1-cil.links | 1 -
debian/libtaoframework-opengl3.0-cil.install | 4 +
debian/libtaoframework-opengl3.0-cil.installcligac | 3 +
debian/libtaoframework-opengl3.0-cil.links | 0
debian/libtaoframework-physfs1.0-cil.install | 5 +-
debian/libtaoframework-physfs1.0-cil.links | 1 -
debian/libtaoframework-sdl1.2-cil.install | 5 +-
debian/libtaoframework-sdl1.2-cil.links | 1 -
debian/monodoc-taoframework-manual.install | 4 +-
debian/patches/100_nunit_pkg_config.diff | 36 ---
debian/patches/200_dllimport_attributes.diff | 36 ---
debian/patches/201_no_resources.diff | 117 -------
debian/patches/202_disable_parts_of_glu_doc.diff | 359 ---------------------
debian/patches/300_proper_dll_config.diff | 30 +-
debian/patches/series | 4 -
debian/rules | 108 ++++---
debian/tao-devil-1.6.pc | 8 -
debian/tao-ffmpeg-0.4.pc | 8 -
debian/tao-freeglut-2.4.pc | 9 -
debian/tao-lua-5.1.pc | 8 -
debian/tao-ode-0.6.pc | 8 -
debian/tao-openal-1.1.pc | 8 -
debian/tao-opengl-2.1.pc | 8 -
debian/tao-physfs-1.0.pc | 8 -
debian/tao-sdl-1.2.pc | 8 -
44 files changed, 108 insertions(+), 744 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0f16c65..c5e8c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-taoframework (2.1.0-1) UNRELEASED; urgency=low
+taoframework (2.1.svn20090213-1) UNRELEASED; urgency=low
- [TODO] Should be checked for FTBFS: I've just refreshed the patches,
- didn't try a full build (lack of disk space!) --David
-
- * New upstream release
+ [ Sam Hocevar ]
+ * Made the build system work with the new upstream release.
+
+ [ David Paleino ]
* Added debian/watch file
* debian/patches/:
+ patches refreshed to cleanly apply to the new release.
diff --git a/debian/control b/debian/control
index 98fc10b..cd838a8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
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, mono-utils, 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-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev, libavformat-dev, libnunit2.4-cil
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-gac, mono-gmcs, mono-utils, 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-mesa-dev | libglu1-dev, libgl1-mesa-dev | libgl1-dev, monodoc-base, liblua5.1-0-dev, libavcodec-dev (>= 0.svn20080206-8), libavformat-dev (>= 0.svn20080206-8), libnunit2.4-cil
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/taoframework/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk?op=log
@@ -21,9 +21,11 @@ Description: examples for all Tao libraries
.
http://www.mono-project.com/Tao
-Package: libtaoframework-opengl2.1-cil
+Package: libtaoframework-opengl3.0-cil
Architecture: all
Depends: ${cli:Depends}
+Conflicts: libtaoframework-opengl2.1-cil
+Replaces: libtaoframework-opengl2.1-cil
Description: Tao CLI binding for OpenGL and GLU
The Tao Framework is a collection of bindings and libraries to
facilitate cross-platform games-related development utilizing the Mono
@@ -74,9 +76,11 @@ Description: Tao CLI binding for DevIL
http://www.mono-project.com/Tao
http://openil.sourceforge.net
-Package: libtaoframework-ode0.6-cil
+Package: libtaoframework-ode0.9-cil
Architecture: all
Depends: ${cli:Depends}
+Conflicts: libtaoframework-ode0.6-cil
+Replaces: libtaoframework-ode0.6-cil
Description: Tao CLI binding for ODE
The Tao Framework is a collection of bindings and libraries to
facilitate cross-platform games-related development utilizing the Mono
diff --git a/debian/libtaoframework-devil1.6-cil.install b/debian/libtaoframework-devil1.6-cil.install
index dbaade4..b44d3db 100644
--- a/debian/libtaoframework-devil1.6-cil.install
+++ b/debian/libtaoframework-devil1.6-cil.install
@@ -1,3 +1,2 @@
-debian/tao-devil-1.6.pc /usr/lib/pkgconfig/
-build/Tao.DevIl.dll /usr/lib/cli/tao-devil-1.6/
-build/Tao.DevIl.dll.config /usr/lib/cli/tao-devil-1.6/
+/usr/lib/cli/tao-devil*
+/usr/lib/pkgconfig/tao-devil*
diff --git a/debian/libtaoframework-devil1.6-cil.links b/debian/libtaoframework-devil1.6-cil.links
index 63a66c6..e69de29 100644
--- a/debian/libtaoframework-devil1.6-cil.links
+++ b/debian/libtaoframework-devil1.6-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-devil-1.6.pc usr/lib/pkgconfig/tao-devil.pc
diff --git a/debian/libtaoframework-ffmpeg0.4-cil.install b/debian/libtaoframework-ffmpeg0.4-cil.install
index 6c33ee1..8cbb126 100644
--- a/debian/libtaoframework-ffmpeg0.4-cil.install
+++ b/debian/libtaoframework-ffmpeg0.4-cil.install
@@ -1,3 +1,2 @@
-debian/tao-ffmpeg-0.4.pc /usr/lib/pkgconfig/
-build/Tao.FFmpeg.dll /usr/lib/cli/tao-ffmpeg-0.4/
-build/Tao.FFmpeg.dll.config /usr/lib/cli/tao-ffmpeg-0.4/
+/usr/lib/cli/tao-ffmpeg*
+/usr/lib/pkgconfig/tao-ffmpeg*
diff --git a/debian/libtaoframework-ffmpeg0.4-cil.links b/debian/libtaoframework-ffmpeg0.4-cil.links
index c7a5ab0..e69de29 100644
--- a/debian/libtaoframework-ffmpeg0.4-cil.links
+++ b/debian/libtaoframework-ffmpeg0.4-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-ffmpeg-0.4.pc usr/lib/pkgconfig/tao-ffmpeg.pc
diff --git a/debian/libtaoframework-freeglut2.4-cil.install b/debian/libtaoframework-freeglut2.4-cil.install
index b4907c2..c3d3c42 100644
--- a/debian/libtaoframework-freeglut2.4-cil.install
+++ b/debian/libtaoframework-freeglut2.4-cil.install
@@ -1,3 +1,2 @@
-debian/tao-freeglut-2.4.pc /usr/lib/pkgconfig/
-build/Tao.FreeGlut.dll /usr/lib/cli/tao-freeglut-2.4/
-build/Tao.FreeGlut.dll.config /usr/lib/cli/tao-freeglut-2.4/
+/usr/lib/cli/tao-freeglut*
+/usr/lib/pkgconfig/tao-freeglut*
diff --git a/debian/libtaoframework-freeglut2.4-cil.links b/debian/libtaoframework-freeglut2.4-cil.links
index 7571867..e69de29 100644
--- a/debian/libtaoframework-freeglut2.4-cil.links
+++ b/debian/libtaoframework-freeglut2.4-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-freeglut-2.4.pc usr/lib/pkgconfig/tao-freeglut.pc
diff --git a/debian/libtaoframework-lua5.1-cil.install b/debian/libtaoframework-lua5.1-cil.install
index f27b7e7..454e99d 100644
--- a/debian/libtaoframework-lua5.1-cil.install
+++ b/debian/libtaoframework-lua5.1-cil.install
@@ -1,3 +1,2 @@
-debian/tao-lua-5.1.pc /usr/lib/pkgconfig/
-build/Tao.Lua.dll /usr/lib/cli/tao-lua-5.1/
-build/Tao.Lua.dll.config /usr/lib/cli/tao-lua-5.1/
+/usr/lib/cli/tao-lua*
+/usr/lib/pkgconfig/tao-lua*
diff --git a/debian/libtaoframework-lua5.1-cil.links b/debian/libtaoframework-lua5.1-cil.links
index 3e2f366..e69de29 100644
--- a/debian/libtaoframework-lua5.1-cil.links
+++ b/debian/libtaoframework-lua5.1-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-lua-5.1.pc usr/lib/pkgconfig/tao-lua.pc
diff --git a/debian/libtaoframework-ode0.6-cil.install b/debian/libtaoframework-ode0.6-cil.install
deleted file mode 100644
index f7b2c09..0000000
--- a/debian/libtaoframework-ode0.6-cil.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tao-ode-0.6.pc /usr/lib/pkgconfig/
-build/Tao.Ode.dll /usr/lib/cli/tao-ode-0.6/
-build/Tao.Ode.dll.config /usr/lib/cli/tao-ode-0.6/
diff --git a/debian/libtaoframework-ode0.6-cil.installcligac b/debian/libtaoframework-ode0.6-cil.installcligac
deleted file mode 100644
index 458837d..0000000
--- a/debian/libtaoframework-ode0.6-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/tao-ode-0.6/Tao.Ode.dll
diff --git a/debian/libtaoframework-ode0.6-cil.links b/debian/libtaoframework-ode0.6-cil.links
deleted file mode 100644
index 9907557..0000000
--- a/debian/libtaoframework-ode0.6-cil.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-ode-0.6.pc usr/lib/pkgconfig/tao-ode.pc
diff --git a/debian/libtaoframework-ode0.9-cil.install b/debian/libtaoframework-ode0.9-cil.install
new file mode 100644
index 0000000..f260e5d
--- /dev/null
+++ b/debian/libtaoframework-ode0.9-cil.install
@@ -0,0 +1,2 @@
+/usr/lib/cli/tao-ode*
+/usr/lib/pkgconfig/tao-ode*
diff --git a/debian/libtaoframework-ode0.9-cil.installcligac b/debian/libtaoframework-ode0.9-cil.installcligac
new file mode 100644
index 0000000..c114a83
--- /dev/null
+++ b/debian/libtaoframework-ode0.9-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-ode-0.9/Tao.Ode.dll
diff --git a/debian/libtaoframework-openal1.1-cil.install b/debian/libtaoframework-openal1.1-cil.install
index a611946..d49b875 100644
--- a/debian/libtaoframework-openal1.1-cil.install
+++ b/debian/libtaoframework-openal1.1-cil.install
@@ -1,3 +1,2 @@
-debian/tao-openal-1.1.pc /usr/lib/pkgconfig/
-build/Tao.OpenAl.dll /usr/lib/cli/tao-openal-1.1/
-build/Tao.OpenAl.dll.config /usr/lib/cli/tao-openal-1.1/
+/usr/lib/cli/tao-openal*
+/usr/lib/pkgconfig/tao-openal*
diff --git a/debian/libtaoframework-openal1.1-cil.links b/debian/libtaoframework-openal1.1-cil.links
index 7fee727..e69de29 100644
--- a/debian/libtaoframework-openal1.1-cil.links
+++ b/debian/libtaoframework-openal1.1-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-openal-1.1.pc usr/lib/pkgconfig/tao-openal.pc
diff --git a/debian/libtaoframework-opengl2.1-cil.install b/debian/libtaoframework-opengl2.1-cil.install
deleted file mode 100644
index 36a9ef0..0000000
--- a/debian/libtaoframework-opengl2.1-cil.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tao-opengl-2.1.pc /usr/lib/pkgconfig/
-build/Tao.OpenGl.dll /usr/lib/cli/tao-opengl-2.1/
-build/Tao.OpenGl.dll.config /usr/lib/cli/tao-opengl-2.1/
-build/Tao.Platform.X11.dll /usr/lib/cli/tao-opengl-2.1/
-build/Tao.Platform.X11.dll.config /usr/lib/cli/tao-opengl-2.1/
diff --git a/debian/libtaoframework-opengl2.1-cil.installcligac b/debian/libtaoframework-opengl2.1-cil.installcligac
deleted file mode 100644
index 29b175b..0000000
--- a/debian/libtaoframework-opengl2.1-cil.installcligac
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/cli/tao-opengl-2.1/Tao.OpenGl.dll
-/usr/lib/cli/tao-opengl-2.1/Tao.Platform.X11.dll
diff --git a/debian/libtaoframework-opengl2.1-cil.links b/debian/libtaoframework-opengl2.1-cil.links
deleted file mode 100644
index 93f6595..0000000
--- a/debian/libtaoframework-opengl2.1-cil.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-opengl-2.1.pc usr/lib/pkgconfig/tao-opengl.pc
diff --git a/debian/libtaoframework-opengl3.0-cil.install b/debian/libtaoframework-opengl3.0-cil.install
new file mode 100644
index 0000000..5e89e4e
--- /dev/null
+++ b/debian/libtaoframework-opengl3.0-cil.install
@@ -0,0 +1,4 @@
+/usr/lib/cli/tao-opengl*
+/usr/lib/pkgconfig/tao-opengl*
+/usr/lib/cli/tao-platform*
+/usr/lib/pkgconfig/tao-platform*
diff --git a/debian/libtaoframework-opengl3.0-cil.installcligac b/debian/libtaoframework-opengl3.0-cil.installcligac
new file mode 100644
index 0000000..188807e
--- /dev/null
+++ b/debian/libtaoframework-opengl3.0-cil.installcligac
@@ -0,0 +1,3 @@
+/usr/lib/cli/tao-opengl-3.0/Tao.OpenGl.dll
+/usr/lib/cli/tao-platform-x11-1.0/Tao.Platform.X11.dll
+/usr/lib/cli/tao-platform-windows-1.0/Tao.Platform.Windows.dll
diff --git a/debian/libtaoframework-opengl3.0-cil.links b/debian/libtaoframework-opengl3.0-cil.links
new file mode 100644
index 0000000..e69de29
diff --git a/debian/libtaoframework-physfs1.0-cil.install b/debian/libtaoframework-physfs1.0-cil.install
index 17f9200..afea062 100644
--- a/debian/libtaoframework-physfs1.0-cil.install
+++ b/debian/libtaoframework-physfs1.0-cil.install
@@ -1,3 +1,2 @@
-debian/tao-physfs-1.0.pc /usr/lib/pkgconfig/
-build/Tao.PhysFs.dll /usr/lib/cli/tao-physfs-1.0/
-build/Tao.PhysFs.dll.config /usr/lib/cli/tao-physfs-1.0/
+/usr/lib/cli/tao-physfs*
+/usr/lib/pkgconfig/tao-physfs*
diff --git a/debian/libtaoframework-physfs1.0-cil.links b/debian/libtaoframework-physfs1.0-cil.links
index b1ce5d4..e69de29 100644
--- a/debian/libtaoframework-physfs1.0-cil.links
+++ b/debian/libtaoframework-physfs1.0-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-physfs-1.0.pc usr/lib/pkgconfig/tao-physfs.pc
diff --git a/debian/libtaoframework-sdl1.2-cil.install b/debian/libtaoframework-sdl1.2-cil.install
index d7e0f73..70ebfcf 100644
--- a/debian/libtaoframework-sdl1.2-cil.install
+++ b/debian/libtaoframework-sdl1.2-cil.install
@@ -1,3 +1,2 @@
-debian/tao-sdl-1.2.pc /usr/lib/pkgconfig/
-build/Tao.Sdl.dll /usr/lib/cli/tao-sdl-1.2/
-build/Tao.Sdl.dll.config /usr/lib/cli/tao-sdl-1.2/
+/usr/lib/cli/tao-sdl*
+/usr/lib/pkgconfig/tao-sdl*
diff --git a/debian/libtaoframework-sdl1.2-cil.links b/debian/libtaoframework-sdl1.2-cil.links
index a08bbbb..e69de29 100644
--- a/debian/libtaoframework-sdl1.2-cil.links
+++ b/debian/libtaoframework-sdl1.2-cil.links
@@ -1 +0,0 @@
-usr/lib/pkgconfig/tao-sdl-1.2.pc usr/lib/pkgconfig/tao-sdl.pc
diff --git a/debian/monodoc-taoframework-manual.install b/debian/monodoc-taoframework-manual.install
index dcf4e7b..114b973 100644
--- a/debian/monodoc-taoframework-manual.install
+++ b/debian/monodoc-taoframework-manual.install
@@ -1,3 +1 @@
-build/doc/Tao.tree /usr/lib/monodoc/sources/
-build/doc/Tao.zip /usr/lib/monodoc/sources/
-debian/Tao.source /usr/lib/monodoc/sources/
+/usr/lib/monodoc
diff --git a/debian/patches/100_nunit_pkg_config.diff b/debian/patches/100_nunit_pkg_config.diff
deleted file mode 100644
index c3e16c2..0000000
--- a/debian/patches/100_nunit_pkg_config.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: taoframework-2.0.0.svn20071027/Tao.Sdl/Tao.Sdl.Tests/Makefile.in
-===================================================================
---- taoframework-2.0.0.svn20071027.orig/Tao.Sdl/Tao.Sdl.Tests/Makefile.in 2007-10-27 09:10:28.000000000 +0000
-+++ taoframework-2.0.0.svn20071027/Tao.Sdl/Tao.Sdl.Tests/Makefile.in 2007-12-18 16:31:35.000000000 +0000
-@@ -176,13 +176,12 @@
- pkgconfigdir = $(prefix)/lib/pkgconfig
- pkgconfig_DATA = Tao.Sdl.Tests.pc
- noinst_DATA = $(ASSEMBLY)
--PACKAGES =
-+PACKAGES = nunit
- BINARY_LIBS = \
- Tao.Sdl.dll
-
- SYSTEM_LIBS = \
-- System \
-- nunit.framework
-+ System
-
- RESOURCES =
- SOURCES = \
-@@ -498,6 +497,7 @@
- mkdir -p bin/Debug && $(CSC) /out:$@ \
- /target:library \
- $(addprefix /r:, $(SYSTEM_LIBS)) \
-+ $(addprefix /pkg:, $(PACKAGES)) \
- $(addprefix /r:$(srcdir)/, $(BINARY_LIBS)) \
- $(addprefix $(srcdir)/, $(SOURCES)) \
- /keyfile:$(srcdir)/Tao.Sdl.snk \
-@@ -523,6 +523,7 @@
- mkdir -p bin/Release && $(CSC) /out:$@ \
- /target:library \
- $(addprefix /r:, $(SYSTEM_LIBS)) \
-+ $(addprefix /pkg:, $(PACKAGES)) \
- $(addprefix /r:$(srcdir)/, $(BINARY_LIBS)) \
- $(addprefix $(srcdir)/, $(SOURCES)) \
- /keyfile:$(srcdir)/Tao.Sdl.snk \
diff --git a/debian/patches/200_dllimport_attributes.diff b/debian/patches/200_dllimport_attributes.diff
deleted file mode 100644
index 5eedb6a..0000000
--- a/debian/patches/200_dllimport_attributes.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-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 */
diff --git a/debian/patches/201_no_resources.diff b/debian/patches/201_no_resources.diff
deleted file mode 100644
index 9883b7b..0000000
--- a/debian/patches/201_no_resources.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-Index: taoframework-2.1.0/source/examples/FFmpegExamples/Player.Designer.cs
-===================================================================
---- 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);
-- 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: taoframework-2.1.0/source/examples/CgExamples/CgExamples.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
-===================================================================
---- 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
-===================================================================
---- 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
-===================================================================
---- 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: taoframework-2.1.0/source/examples/NeHe/NeHe.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
-===================================================================
---- 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: taoframework-2.1.0/source/examples/Redbook/Redbook.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
-===================================================================
---- 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
deleted file mode 100644
index 54cd6cf..0000000
--- a/debian/patches/202_disable_parts_of_glu_doc.diff
+++ /dev/null
@@ -1,359 +0,0 @@
-Index: taoframework-2.1.0/source/src/Tao.OpenGl/Glu.cs
-===================================================================
---- 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 ---
- #region NurbsBeginCallback(int type)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void begin(GLenum type);
- public delegate void NurbsBeginCallback(int type);
- #endregion NurbsBeginCallback(int type)
-
- #region NurbsBeginDataCallback(int type, [In] IntPtr[] userData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void beginData(GLenum type, void *userData);
- public delegate void NurbsBeginDataCallback(int type, [In] IntPtr[] userData);
- #endregion NurbsBeginDataCallback(int type, [In] IntPtr[] userData)
-
- #region NurbsColorCallback([In] float[] colorData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void color(GLfloat *color);
- public delegate void NurbsColorCallback([In] float[] colorData);
- #endregion NurbsColorCallback([In] float[] colorData)
-
- #region NurbsColorDataCallback([In] float[] colorData, [In] IntPtr[] userData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void colorData(GLfloat *color, void *userData);
- public delegate void NurbsColorDataCallback([In] float[] colorData, [In] IntPtr[] userData);
- #endregion NurbsColorDataCallback([In] float[] colorData, [In] IntPtr[] userData)
-
- #region NurbsEndCallback()
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void end(void);
- public delegate void NurbsEndCallback();
- #endregion NurbsEndCallback()
-
- #region NurbsEndDataCallback([In] IntPtr[] userData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void endData(void *userData);
- public delegate void NurbsEndDataCallback([In] IntPtr[] userData);
- #endregion NurbsEndDataCallback([In] IntPtr[] userData)
-
- #region NurbsErrorCallback(int type)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // typedef void (CALLBACK* GLUnurbsErrorProc) (GLenum);
- public delegate void NurbsErrorCallback(int type);
- #endregion NurbsErrorCallback(int type)
-
- #region NurbsNormalCallback([In] float[] normalData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void normal(GLfloat *normal);
- public delegate void NurbsNormalCallback([In] float[] normalData);
- #endregion NurbsNormalCallback([In] float[] normalData)
-
- #region NurbsNormalDataCallback([In] float[] normalData, [In] IntPtr[] userData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void normalData(GLfloat *normal, void *userData);
- public delegate void NurbsNormalDataCallback([In] float[] normalData, [In] IntPtr[] userData);
- #endregion NurbsNormalDataCallback([In] float[] normalData, [In] IntPtr[] userData)
-
- #region NurbsTexCoordCallback([In] float[] texCoord)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void texCoord(GLfloat *tex coord);
- public delegate void NurbsTexCoordCallback([In] float[] texCoord);
- #endregion NurbsTexCoordCallback([In] float[] texCoord)
-
- #region NurbsTexCoordDataCallback([In] float[] texCoord, [In] IntPtr[] userData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void texCoordData(GLfloat *tex coord, void *userData);
- public delegate void NurbsTexCoordDataCallback([In] float[] texCoord, [In] IntPtr[] userData);
- #endregion NurbsTexCoordDataCallback([In] float[] texCoord, [In] IntPtr[] userData)
-
- #region NurbsVertexCallback([In] float[] vertexData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // void vertex(GLfloat *vertex);
- public delegate void NurbsVertexCallback([In] float[] vertexData);
- #endregion NurbsVertexCallback([In] float[] vertexData)
-
- #region NurbsVertexDataCallback([In] float[] vertexData, [In] IntPtr[] userData)
-- /// <summary>
-- /// Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-- /// </summary>
-- /// <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
-+ // <summary>
-+ // Callback (delegate) for use with <see cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />.
-+ // </summary>
-+ // <seealso cref="gluNurbsCallback(Tao.OpenGl.Glu.GLUnurbs, int, Tao.OpenGl.Glu.NurbsBeginCallback)" />
- // 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 @@
- #endregion QuadricErrorCallback(int errorCode)
-
- #region TessBeginCallback(int type)
-- /// <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* GLUtessBeginProc) (GLenum);
- public delegate void TessBeginCallback(int type);
- #endregion TessBeginCallback(int type)
-
- #region TessBeginDataCallback(int type, [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* GLUtessBeginDataProc) (GLenum, void *);
- public delegate void TessBeginDataCallback(int type, [In] IntPtr polygonData);
- #endregion TessBeginDataCallback(int type, [In] IntPtr polygonData)
-
- #region TessCombineCallback([In] double[] coordinates, [In] IntPtr[] vertexData, [In] float[] weight, [Out] IntPtr[] outData)
-- /// <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* GLUtessCombineProc) (GLdouble[3], void*[4], GLfloat[4], void**);
- public delegate void TessCombineCallback([In] double[] coordinates, [In] IntPtr[] vertexData, [In] float[] weight, [Out] IntPtr[] outData);
- #endregion TessCombineCallback([In] double[] coordinates, [In] IntPtr[] vertexData, [In] float[] weight, [Out] IntPtr[] outData)
-
- #region TessCombineCallback1([In] double[] coordinates, [In] double[][] vertexData, [In] float[] weight, [Out] double[] outData)
-- /// <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* GLUtessCombineProc) (GLdouble[3], void*[4], GLfloat[4], void**);
- public delegate void TessCombineCallback1([MarshalAs(UnmanagedType.LPArray, SizeConst=3)] [In] double[] coordinates, [MarshalAs(UnmanagedType.LPArray, SizeConst=4)] [In] double[] vertexData, [MarshalAs(UnmanagedType.LPArray, SizeConst=4)] [In] float[] weight, [Out] double[] outData);
- #endregion TessCombineCallback1([In] double[] coordinates, [In] double[][] vertexData, [In] float[] weight, [Out] double[] outData)
-
- #region TessCombineDataCallback([In] double[] coordinates, [In] IntPtr[] vertexData, [In] float[] weight, [Out] IntPtr[] outData, [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* GLUtessCombineDataProc) (GLdouble[3], void*[4], GLfloat[4], void**, void*);
- public delegate void TessCombineDataCallback([In] double[] coordinates, [In] IntPtr[] vertexData, [In] float[] weight, [Out] IntPtr[] outData, [In] IntPtr polygonData);
- #endregion TessCombineDataCallback([In] double[] coordinates, [In] IntPtr[] vertexData, [In] float[] weight, [Out] IntPtr[] outData, [In] IntPtr polygonData)
-
- #region TessEdgeFlagCallback(int flag)
-- /// <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* 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);
- #endregion TessEdgeFlagDataCallback(int flag, [In] IntPtr polygonData)
-
- #region TessEndCallback()
-- /// <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* GLUtessEndProc) (void);
- public delegate void TessEndCallback();
- #endregion TessEndCallback()
-
- #region TessEndDataCallback([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* GLUtessEndDataProc) (void *);
- public delegate void TessEndDataCallback(IntPtr polygonData);
- #endregion TessEndDataCallback(IntPtr polygonData)
-
- #region TessErrorCallback(int errorCode)
-- /// <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* GLUtessErrorProc) (GLenum);
- public delegate void TessErrorCallback(int errorCode);
- #endregion TessErrorCallback(int errorCode)
-
- #region TessErrorDataCallback(int errorCode, [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* GLUtessErrorDataProc) (GLenum, void *);
- public delegate void TessErrorDataCallback(int errorCode, [In] IntPtr polygonData);
- #endregion TessErrorDataCallback(int errorCode, [In] IntPtr polygonData)
-
- #region TessVertexCallback([In] IntPtr vertexData)
-- /// <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* GLUtessVertexProc) (void *);
- public delegate void TessVertexCallback([In] IntPtr vertexData);
- #endregion TessVertexCallback([In] IntPtr vertexData)
-
- #region TessVertexCallback1([In] double[] vertexData)
-- /// <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* GLUtessVertexProc) (void *);
- public delegate void TessVertexCallback1([In] double[] vertexData);
- #endregion TessVertexCallback1([In] double[] vertexData)
-
- #region TessVertexDataCallback([In] IntPtr vertexData, [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* GLUtessVertexDataProc) (void *, void *);
- public delegate void TessVertexDataCallback([In] IntPtr vertexData, [In] IntPtr polygonData);
- #endregion TessVertexDataCallback([In] IntPtr vertexData, [In] IntPtr polygonData)
diff --git a/debian/patches/300_proper_dll_config.diff b/debian/patches/300_proper_dll_config.diff
index e5e2cac..2873824 100644
--- a/debian/patches/300_proper_dll_config.diff
+++ b/debian/patches/300_proper_dll_config.diff
@@ -1,8 +1,8 @@
-Index: taoframework-2.1.0/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+Index: taoframework-2.1.0/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.1.0.orig/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
-+++ taoframework-2.1.0/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
-@@ -1,16 +1,16 @@
+--- taoframework-2.1.0.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
++++ taoframework-2.1.0/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+@@ -1,21 +1,21 @@
<configuration>
<dllmap dll="avcodec-51.dll">
- <dllentry os="linux" dll="libavcodec.so.1d" />
@@ -10,10 +10,10 @@ Index: taoframework-2.1.0/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
<dllentry os="windows" dll="avcodec-51.dll" />
<dllentry os="osx" dll="libavcodec.so.1d" />
</dllmap>
- <dllmap dll="avformat-51.dll">
+ <dllmap dll="avformat-52.dll">
- <dllentry os="linux" dll="libavformat.so.1d" />
+ <dllentry os="linux" dll="libavformat.so.52" />
- <dllentry os="windows" dll="avformat-51.dll" />
+ <dllentry os="windows" dll="avformat-52.dll" />
<dllentry os="osx" dll="libavformat.so.1d" />
</dllmap>
<dllmap dll="avutil-49.dll">
@@ -22,15 +22,9 @@ Index: taoframework-2.1.0/source/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
<dllentry os="windows" dll="avutil-49.dll" />
<dllentry os="osx" dll="libavutil.so.1d" />
</dllmap>
-Index: taoframework-2.1.0/source/src/Tao.OpenAl/Tao.OpenAl.dll.config
-===================================================================
---- taoframework-2.1.0.orig/source/src/Tao.OpenAl/Tao.OpenAl.dll.config
-+++ taoframework-2.1.0/source/src/Tao.OpenAl/Tao.OpenAl.dll.config
-@@ -1,6 +1,6 @@
- <configuration>
- <dllmap dll="OpenAL32.dll">
-- <dllentry os="linux" dll="libopenal.so.0" />
-+ <dllentry os="linux" dll="libopenal.so.1" />
- <dllentry os="windows" dll="OpenAL32.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
- </dllmap>
+ <dllmap dll="swscale-0.dll">
+- <dllentry os="linux" dll="libswscale.so.1d" />
++ <dllentry os="linux" dll="libswscale.so.0" />
+ <dllentry os="windows" dll="swscale-0.dll" />
+ <dllentry os="osx" dll="libswscale.so.1d" />
+ </dllmap>
diff --git a/debian/patches/series b/debian/patches/series
index f2f7c89..55bfdcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-#100_nunit_pkg_config.diff
-#200_dllimport_attributes.diff
-201_no_resources.diff
-202_disable_parts_of_glu_doc.diff
300_proper_dll_config.diff
diff --git a/debian/rules b/debian/rules
index 7890a69..629fab1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,71 +7,66 @@ export MONO_SHARED_DIR=$(CURDIR)
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
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- for builddir in $(BUILDDIRS); do \
- (cd Tao.$$builddir && ./configure) || exit 1; \
- done
+ ./configure --prefix=/usr
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- for builddir in $(BUILDDIRS); do \
- (cd Tao.$$builddir && $(MAKE)) || exit 1; \
- done
+ $(MAKE)
# Build the documentation and also copy the .config files to a
# place that dh_install can use.
- 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\|Glfw\|Tests\|Windows\)'); do \
- base="$${dir##*/}"; \
- cp $(CURDIR)/$$dir/$$base.dll \
- $(CURDIR)/$$dir/$$base.dll.config \
- $(CURDIR)/build/; \
- /usr/bin/monodocer --assembly:$(CURDIR)/build/$$base.dll \
- --path:$(CURDIR)/build/doc/tmp/$$base; \
- pkg=$$(echo $$base | cut -f2 -d. | tr A-Z a-z); \
- if [ "$$pkg" = "platform" ]; then continue; fi; \
- version=$$(monodis --assembly $(CURDIR)/build/$$base.dll | sed -ne 's/Version:[[:space:]]*//p'); \
- abi=$$(echo $$version | cut -f1,2 -d.); \
- if [ ! -f debian/tao-$$pkg-$$abi.pc ]; then echo "Error: file debian/tao-$$pkg-$$abi.pc for tao.$$base (version $$version) not found"; exit 1; fi; \
- pcversion=$$(sed -ne 's/Version:[[:space:]]*//p' debian/tao-$$pkg-$$abi.pc); \
- if [ "$$version" != "$$pcversion" ]; then echo "Error: version $$pcversion in debian/tao-$$pkg-$$abi.pc does not match tao.$$base version $$version"; exit 1; fi; \
- if [ ! -f debian/libtaoframework-$$pkg$$abi-cil.install ]; then echo "Error: file debian/libtaoframework-$$pkg$$abi-cil.install for tao.$$base (version $$version) not found"; exit 1; fi; \
- 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)/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 \
- base="$${dir##*/}"; \
- mkdir -p $(CURDIR)/build/examples/$$base; \
- cp $(CURDIR)/$$dir/*.cs \
- $(CURDIR)/build/examples/$$base/; \
- for subdir in Properties Data Resources; do \
- [ ! -d $(CURDIR)/$$dir/$$subdir ] || \
- cp -r $(CURDIR)/$$dir/$$subdir $(CURDIR)/build/examples/$$base/; \
- done; \
- done
+ #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\|Glfw\|Tests\|Windows\)'); do \
+ # base="$${dir##*/}"; \
+ # cp $(CURDIR)/$$dir/$$base.dll \
+ # $(CURDIR)/$$dir/$$base.dll.config \
+ # $(CURDIR)/build/; \
+ # /usr/bin/monodocer --assembly:$(CURDIR)/build/$$base.dll \
+ # --path:$(CURDIR)/build/doc/tmp/$$base; \
+ # pkg=$$(echo $$base | cut -f2 -d. | tr A-Z a-z); \
+ # if [ "$$pkg" = "platform" ]; then continue; fi; \
+ # version=$$(monodis --assembly $(CURDIR)/build/$$base.dll | sed -ne 's/Version:[[:space:]]*//p'); \
+ # abi=$$(echo $$version | cut -f1,2 -d.); \
+ # if [ ! -f debian/tao-$$pkg-$$abi.pc ]; then echo "Error: file debian/tao-$$pkg-$$abi.pc for tao.$$base (version $$version) not found"; exit 1; fi; \
+ # pcversion=$$(sed -ne 's/Version:[[:space:]]*//p' debian/tao-$$pkg-$$abi.pc); \
+ # if [ "$$version" != "$$pcversion" ]; then echo "Error: version $$pcversion in debian/tao-$$pkg-$$abi.pc does not match tao.$$base version $$version"; exit 1; fi; \
+ # if [ ! -f debian/libtaoframework-$$pkg$$abi-cil.install ]; then echo "Error: file debian/libtaoframework-$$pkg$$abi-cil.install for tao.$$base (version $$version) not found"; exit 1; fi; \
+ #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)/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 \
+ # base="$${dir##*/}"; \
+ # mkdir -p $(CURDIR)/build/examples/$$base; \
+ # cp $(CURDIR)/$$dir/*.cs \
+ # $(CURDIR)/build/examples/$$base/; \
+ # for subdir in Properties Data Resources; do \
+ # [ ! -d $(CURDIR)/$$dir/$$subdir ] || \
+ # cp -r $(CURDIR)/$$dir/$$subdir $(CURDIR)/build/examples/$$base/; \
+ # done; \
+ #done
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f debian/*.config
+ #rm -f debian/*.config
rm -f build-stamp configure-stamp
- rm -rf $(CURDIR)/build
- for builddir in $(BUILDDIRS); do \
- (cd Tao.$$builddir && [ ! -f Makefile ] || $(MAKE) distclean) || exit 1; \
- done
+ [ ! -f Makefile ] || $(MAKE) distclean
+ #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
@@ -79,6 +74,22 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
+ $(MAKE) install DESTDIR=$$(pwd)/debian/tmp
+
+ # On Debian, we want stuff in /usr/lib/cli instead of /usr/lib/mono
+ # and we manage the GAC ourselves.
+ mkdir debian/tmp/usr/lib/cli
+ find debian -path '*lib/mono/tao*' | while read src; do \
+ dest=$$(echo "$$src" | sed s,/mono/,/cli/,); \
+ [ -d "$$src" ] && mkdir "$$dest"; \
+ [ -f "$$src" ] && cp "$$src" "$$dest" && rm -f "$$src"; \
+ done
+ find debian -path '*lib/pkgconfig/*.pc' | while read pc; do \
+ sed -i 's,/mono/,/cli/,' "$$pc"; \
+ done
+ rm -Rf debian/tmp/usr/lib/mono/gac
+
+ dh_install -si --list-missing --sourcedir=debian/tmp
dh_installdirs
binary-arch:
@@ -87,7 +98,6 @@ binary-arch:
binary-indep: build install
dh_testdir
dh_testroot
- dh_install
dh_installcligac
dh_installchangelogs
dh_installdocs
diff --git a/debian/tao-devil-1.6.pc b/debian/tao-devil-1.6.pc
deleted file mode 100644
index 49f5da0..0000000
--- a/debian/tao-devil-1.6.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.DevIl
-Description: DevIl portion of the Tao framework
-Version: 1.6.8.0
-Libs: -r:${libdir}/cli/tao-devil-1.6/Tao.DevIl.dll
diff --git a/debian/tao-ffmpeg-0.4.pc b/debian/tao-ffmpeg-0.4.pc
deleted file mode 100644
index fefdd72..0000000
--- a/debian/tao-ffmpeg-0.4.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.FFmpeg
-Description: FFmpeg portion of the Tao framework
-Version: 0.4.9.0
-Libs: -r:${libdir}/cli/tao-ffmpeg-0.4/Tao.FFmpeg.dll
diff --git a/debian/tao-freeglut-2.4.pc b/debian/tao-freeglut-2.4.pc
deleted file mode 100644
index fc34914..0000000
--- a/debian/tao-freeglut-2.4.pc
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.FreeGlut
-Description: FreeGlut portion of the Tao framework
-Version: 2.4.0.1
-Requires: tao-opengl-2.1
-Libs: -r:${libdir}/cli/tao-freeglut-2.4/Tao.FreeGlut.dll
diff --git a/debian/tao-lua-5.1.pc b/debian/tao-lua-5.1.pc
deleted file mode 100644
index 0534b9e..0000000
--- a/debian/tao-lua-5.1.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.Lua
-Description: Lua portion of the Tao framework
-Version: 5.1.1.0
-Libs: -r:${libdir}/cli/tao-lua-5.1/Tao.Lua.dll
diff --git a/debian/tao-ode-0.6.pc b/debian/tao-ode-0.6.pc
deleted file mode 100644
index cd13a83..0000000
--- a/debian/tao-ode-0.6.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.Ode
-Description: Ode portion of the Tao framework
-Version: 0.6.0.3
-Libs: -r:${libdir}/cli/tao-ode-0.6/Tao.Ode.dll
diff --git a/debian/tao-openal-1.1.pc b/debian/tao-openal-1.1.pc
deleted file mode 100644
index 3823f92..0000000
--- a/debian/tao-openal-1.1.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.OpenAl
-Description: OpenAl portion of Tao framework
-Version: 1.1.0.0
-Libs: -r:${libdir}/cli/tao-openal-1.1/Tao.OpenAl.dll
diff --git a/debian/tao-opengl-2.1.pc b/debian/tao-opengl-2.1.pc
deleted file mode 100644
index fd9cc34..0000000
--- a/debian/tao-opengl-2.1.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.OpenGl
-Description: OpenGL section of the Tao framework
-Version: 2.1.0.7
-Libs: -r:${libdir}/cli/tao-opengl-2.1/Tao.OpenGl.dll -r:${libdir}/cli/tao-opengl-2.1/Tao.Platform.X11.dll
diff --git a/debian/tao-physfs-1.0.pc b/debian/tao-physfs-1.0.pc
deleted file mode 100644
index 1c0acdf..0000000
--- a/debian/tao-physfs-1.0.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.PhysFs
-Description: PhysFs section of the Tao framework
-Version: 1.0.1.1
-Libs: -r:${libdir}/cli/tao-physfs-1.0/Tao.PhysFs.dll
diff --git a/debian/tao-sdl-1.2.pc b/debian/tao-sdl-1.2.pc
deleted file mode 100644
index 35c7ccd..0000000
--- a/debian/tao-sdl-1.2.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: Tao.Sdl
-Description: Sdl portion of the Tao framework
-Version: 1.2.12.0
-Libs: -r:${libdir}/cli/tao-sdl-1.2/Tao.Sdl.dll
--
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