[Pkg-cli-libs-commits] r4000 - in /packages/taoframework/trunk/debian: ./ patches/
sho at users.alioth.debian.org
sho at users.alioth.debian.org
Fri Feb 13 18:18:19 UTC 2009
Author: sho
Date: Fri Feb 13 18:18:19 2009
New Revision: 4000
URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4000
Log:
taoframework (2.1.svn20090213-1) UNRELEASED; urgency=low
* Made the build system work with the new upstream release.
Added:
packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.install
packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.installcligac
packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.install (contents, props changed)
- copied, changed from r3999, packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.install
packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.installcligac (contents, props changed)
- copied, changed from r3999, packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.installcligac
packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.links (contents, props changed)
- copied, changed from r3999, packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.links
Removed:
packages/taoframework/trunk/debian/libtaoframework-ode0.6-cil.install
packages/taoframework/trunk/debian/libtaoframework-ode0.6-cil.installcligac
packages/taoframework/trunk/debian/libtaoframework-ode0.6-cil.links
packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.install
packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.installcligac
packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.links
packages/taoframework/trunk/debian/patches/100_nunit_pkg_config.diff
packages/taoframework/trunk/debian/patches/200_dllimport_attributes.diff
packages/taoframework/trunk/debian/patches/201_no_resources.diff
packages/taoframework/trunk/debian/patches/202_disable_parts_of_glu_doc.diff
packages/taoframework/trunk/debian/tao-devil-1.6.pc
packages/taoframework/trunk/debian/tao-ffmpeg-0.4.pc
packages/taoframework/trunk/debian/tao-freeglut-2.4.pc
packages/taoframework/trunk/debian/tao-lua-5.1.pc
packages/taoframework/trunk/debian/tao-ode-0.6.pc
packages/taoframework/trunk/debian/tao-openal-1.1.pc
packages/taoframework/trunk/debian/tao-opengl-2.1.pc
packages/taoframework/trunk/debian/tao-physfs-1.0.pc
packages/taoframework/trunk/debian/tao-sdl-1.2.pc
Modified:
packages/taoframework/trunk/debian/changelog
packages/taoframework/trunk/debian/control
packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.install
packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.links
packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.install
packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.links
packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.install
packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.links
packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.install
packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.links
packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.install
packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.links
packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.install
packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.links
packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.install
packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.links
packages/taoframework/trunk/debian/monodoc-taoframework-manual.install
packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff
packages/taoframework/trunk/debian/patches/series
packages/taoframework/trunk/debian/rules
Modified: packages/taoframework/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/changelog?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/changelog (original)
+++ packages/taoframework/trunk/debian/changelog Fri Feb 13 18:18:19 2009
@@ -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.
Modified: packages/taoframework/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/control?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/control (original)
+++ packages/taoframework/trunk/debian/control Fri Feb 13 18:18:19 2009
@@ -4,7 +4,7 @@
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 @@
.
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 @@
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
Modified: packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-devil1.6-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-devil-1.6.pc usr/lib/pkgconfig/tao-devil.pc
Modified: packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-ffmpeg0.4-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-ffmpeg-0.4.pc usr/lib/pkgconfig/tao-ffmpeg.pc
Modified: packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-freeglut2.4-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-freeglut-2.4.pc usr/lib/pkgconfig/tao-freeglut.pc
Modified: packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-lua5.1-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-lua-5.1.pc usr/lib/pkgconfig/tao-lua.pc
Added: packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.install?rev=4000&op=file
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.install (added)
+++ packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.install Fri Feb 13 18:18:19 2009
@@ -1,0 +1,2 @@
+/usr/lib/cli/tao-ode*
+/usr/lib/pkgconfig/tao-ode*
Added: packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.installcligac?rev=4000&op=file
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.installcligac (added)
+++ packages/taoframework/trunk/debian/libtaoframework-ode0.9-cil.installcligac Fri Feb 13 18:18:19 2009
@@ -1,0 +1,1 @@
+/usr/lib/cli/tao-ode-0.9/Tao.Ode.dll
Modified: packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-openal1.1-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-openal-1.1.pc usr/lib/pkgconfig/tao-openal.pc
Copied: packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.install (from r3999, packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.install)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.install Fri Feb 13 18:18:19 2009
@@ -1,5 +1,4 @@
-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/
+/usr/lib/cli/tao-opengl*
+/usr/lib/pkgconfig/tao-opengl*
+/usr/lib/cli/tao-platform*
+/usr/lib/pkgconfig/tao-platform*
Propchange: packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.install
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.installcligac (from r3999, packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.installcligac)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.installcligac?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.installcligac (original)
+++ packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.installcligac Fri Feb 13 18:18:19 2009
@@ -1,2 +1,3 @@
-/usr/lib/cli/tao-opengl-2.1/Tao.OpenGl.dll
-/usr/lib/cli/tao-opengl-2.1/Tao.Platform.X11.dll
+/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
Propchange: packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.installcligac
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.links (from r3999, packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.links)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-opengl2.1-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-opengl-2.1.pc usr/lib/pkgconfig/tao-opengl.pc
Propchange: packages/taoframework/trunk/debian/libtaoframework-opengl3.0-cil.links
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-physfs1.0-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-physfs-1.0.pc usr/lib/pkgconfig/tao-physfs.pc
Modified: packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.install (original)
+++ packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.install Fri Feb 13 18:18:19 2009
@@ -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*
Modified: packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.links
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.links?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.links (original)
+++ packages/taoframework/trunk/debian/libtaoframework-sdl1.2-cil.links Fri Feb 13 18:18:19 2009
@@ -1,1 +1,0 @@
-usr/lib/pkgconfig/tao-sdl-1.2.pc usr/lib/pkgconfig/tao-sdl.pc
Modified: packages/taoframework/trunk/debian/monodoc-taoframework-manual.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/monodoc-taoframework-manual.install?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/monodoc-taoframework-manual.install (original)
+++ packages/taoframework/trunk/debian/monodoc-taoframework-manual.install Fri Feb 13 18:18:19 2009
@@ -1,3 +1,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
Modified: packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff (original)
+++ packages/taoframework/trunk/debian/patches/300_proper_dll_config.diff Fri Feb 13 18:18:19 2009
@@ -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 @@
<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 @@
<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>
Modified: packages/taoframework/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/patches/series?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/patches/series (original)
+++ packages/taoframework/trunk/debian/patches/series Fri Feb 13 18:18:19 2009
@@ -1,5 +1,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
Modified: packages/taoframework/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/rules?rev=4000&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/rules (original)
+++ packages/taoframework/trunk/debian/rules Fri Feb 13 18:18:19 2009
@@ -7,71 +7,66 @@
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 @@
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-indep: build install
dh_testdir
dh_testroot
- dh_install
dh_installcligac
dh_installchangelogs
dh_installdocs
More information about the Pkg-cli-libs-commits
mailing list