[Pkg-cli-libs-commits] [taoframework] 13/91: Bringing Tao inline with 0.4.0 policy changes.
Jo Shields
directhex at moszumanska.debian.org
Mon Sep 22 08:33:16 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 ad77bc452f5b884be31cc704429e505595ec8f10
Author: Dylan R. E. Moonfire <debian at mfgames.com>
Date: Tue Mar 28 20:14:23 2006 +0000
Bringing Tao inline with 0.4.0 policy changes.
---
debian/control | 2 +-
debian/libtao-devil1.6-cil.install | 7 ++---
debian/libtao-devil1.6-cil.installcligac | 1 +
debian/libtao-freeglut2.2-cil.install | 7 ++---
debian/libtao-freeglut2.2-cil.installcligac | 1 +
debian/libtao-ode0.5-cil.install | 7 ++---
debian/libtao-ode0.5-cil.installcligac | 1 +
debian/libtao-openal1.0-cil.install | 7 ++---
debian/libtao-openal1.0-cil.installcligac | 1 +
debian/libtao-opengl1.5-cil.install | 19 +++++-------
debian/libtao-opengl1.5-cil.installcligac | 3 ++
debian/libtao-physfs1.0-cil.install | 7 ++---
debian/libtao-physfs1.0-cil.installcligac | 1 +
debian/libtao-sdl1.2-cil.install | 7 ++---
debian/libtao-sdl1.2-cil.installcligac | 1 +
debian/monodoc-tao-manual.install | 4 ++-
debian/monodoc-tao-manual.prerm | 1 +
debian/rules | 35 ++--------------------
debian/{tao-devil.pc => tao-devil-1.6.pc} | 4 +--
debian/{tao-freeglut.pc => tao-freeglut-2.2.pc} | 6 ++--
debian/{tao-ode.pc => tao-ode-0.5.pc} | 4 +--
debian/{tao-openal.pc => tao-openal-1.0.pc} | 4 +--
debian/tao-opengl-1.5.pc | 8 +++++
.../{tao-opengl-glu.pc => tao-opengl-glu-1.5.pc} | 6 ++--
debian/tao-opengl.pc | 8 -----
debian/{tao-physfs.pc => tao-physfs-1.0.pc} | 4 +--
debian/{tao-sdl.pc => tao-sdl-1.2.pc} | 4 +--
27 files changed, 66 insertions(+), 94 deletions(-)
diff --git a/debian/control b/debian/control
index 6a95662..a7d471b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Dylan R. E. Moonfire <debian at mfgames.com>
Uploaders: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends-Indep: debhelper (>= 5), cli-common (>= 0.2.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, dpatch, monodoc-base
+Build-Depends-Indep: debhelper (>= 5), cli-common (>= 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, dpatch, monodoc-base
Standards-Version: 3.6.2
Package: libtao-cil-examples
diff --git a/debian/libtao-devil1.6-cil.install b/debian/libtao-devil1.6-cil.install
index 3f303e9..e1b94ff 100644
--- a/debian/libtao-devil1.6-cil.install
+++ b/debian/libtao-devil1.6-cil.install
@@ -1,4 +1,3 @@
-usr/share/pkgconfig/tao-devil.pc
-usr/lib/tao/Tao.DevIl.dll
-usr/lib/tao/Tao.DevIl.dll.config
-usr/lib/mono/gac/Tao.DevIl
+debian/tao-devil-1.6.pc /usr/share/pkgconfig/
+dist/bin/Tao.DevIl.dll /usr/lib/cli/tao-devil1.6/
+dist/bin/Tao.DevIl.dll.config /usr/lib/cli/tao-devil1.6/
diff --git a/debian/libtao-devil1.6-cil.installcligac b/debian/libtao-devil1.6-cil.installcligac
new file mode 100644
index 0000000..45f6de0
--- /dev/null
+++ b/debian/libtao-devil1.6-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-devil1.6/Tao.DevIl.dll
diff --git a/debian/libtao-freeglut2.2-cil.install b/debian/libtao-freeglut2.2-cil.install
index d7b78e2..efdd92e 100644
--- a/debian/libtao-freeglut2.2-cil.install
+++ b/debian/libtao-freeglut2.2-cil.install
@@ -1,4 +1,3 @@
-usr/share/pkgconfig/tao-freeglut.pc
-usr/lib/tao/Tao.FreeGlut.dll
-usr/lib/tao/Tao.FreeGlut.dll.config
-usr/lib/mono/gac/Tao.FreeGlut
+debian/tao-freeglut-2.2.pc /usr/share/pkgconfig/
+dist/bin/Tao.FreeGlut.dll /usr/lib/cli/tao-freeglut2.2/
+dist/bin/Tao.FreeGlut.dll.config /usr/lib/cli/tao-freeglut2.2/
diff --git a/debian/libtao-freeglut2.2-cil.installcligac b/debian/libtao-freeglut2.2-cil.installcligac
new file mode 100644
index 0000000..41b0a09
--- /dev/null
+++ b/debian/libtao-freeglut2.2-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-freeglut2.2/Tao.FreeGlut.dll
diff --git a/debian/libtao-ode0.5-cil.install b/debian/libtao-ode0.5-cil.install
index 623e24d..d579df4 100644
--- a/debian/libtao-ode0.5-cil.install
+++ b/debian/libtao-ode0.5-cil.install
@@ -1,4 +1,3 @@
-usr/share/pkgconfig/tao-ode.pc
-usr/lib/tao/Tao.Ode.dll
-usr/lib/tao/Tao.Ode.dll.config
-usr/lib/mono/gac/Tao.Ode
+debian/tao-ode-0.5.pc /usr/share/pkgconfig/
+dist/bin/Tao.Ode.dll /usr/lib/cli/tao-ode0.5/
+dist/bin/Tao.Ode.dll.config /usr/lib/cli/tao-ode0.5/
diff --git a/debian/libtao-ode0.5-cil.installcligac b/debian/libtao-ode0.5-cil.installcligac
new file mode 100644
index 0000000..b9d4b1a
--- /dev/null
+++ b/debian/libtao-ode0.5-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-ode0.5/Tao.Ode.dll
diff --git a/debian/libtao-openal1.0-cil.install b/debian/libtao-openal1.0-cil.install
index ad7a29a..cbf90e7 100644
--- a/debian/libtao-openal1.0-cil.install
+++ b/debian/libtao-openal1.0-cil.install
@@ -1,4 +1,3 @@
-usr/share/pkgconfig/tao-openal.pc
-usr/lib/tao/Tao.OpenAl.dll
-usr/lib/tao/Tao.OpenAl.dll.config
-usr/lib/mono/gac/Tao.OpenAl
+debian/tao-openal-1.0.pc /usr/share/pkgconfig/
+dist/bin/Tao.OpenAl.dll /usr/lib/cli/tao-openal1.0/
+dist/bin/Tao.OpenAl.dll.config /usr/lib/cli/tao-openal1.0/
diff --git a/debian/libtao-openal1.0-cil.installcligac b/debian/libtao-openal1.0-cil.installcligac
new file mode 100644
index 0000000..03a21d9
--- /dev/null
+++ b/debian/libtao-openal1.0-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-openal1.0/Tao.OpenAl.dll
diff --git a/debian/libtao-opengl1.5-cil.install b/debian/libtao-opengl1.5-cil.install
index ccc3799..85de4f8 100644
--- a/debian/libtao-opengl1.5-cil.install
+++ b/debian/libtao-opengl1.5-cil.install
@@ -1,11 +1,8 @@
-usr/share/pkgconfig/tao-opengl.pc
-usr/lib/tao/Tao.OpenGl.dll
-usr/lib/tao/Tao.OpenGl.dll.config
-usr/lib/tao/Tao.OpenGl.ExtensionLoader.dll
-usr/lib/tao/Tao.OpenGl.ExtensionLoader.dll.config
-usr/lib/mono/gac/Tao.OpenGl
-usr/lib/mono/gac/Tao.OpenGl.ExtensionLoader
-usr/share/pkgconfig/tao-opengl-glu.pc
-usr/lib/tao/Tao.OpenGl.Glu.dll
-usr/lib/tao/Tao.OpenGl.Glu.dll.config
-usr/lib/mono/gac/Tao.OpenGl.Glu
+debian/tao-opengl-1.5.pc /usr/share/pkgconfig/
+debian/tao-opengl-glu-1.5.pc /usr/share/pkgconfig/
+dist/bin/Tao.OpenGl.dll /usr/lib/cli/tao-opengl1.5/
+dist/bin/Tao.OpenGl.dll.config /usr/lib/cli/tao-opengl1.5/
+dist/bin/Tao.OpenGl.ExtensionLoader.dll /usr/lib/cli/tao-opengl1.5/
+dist/bin/Tao.OpenGl.ExtensionLoader.dll.config /usr/lib/cli/tao-opengl1.5/
+dist/bin/Tao.OpenGl.Glu.dll /usr/lib/cli/tao-opengl1.5/
+dist/bin/Tao.OpenGl.Glu.dll.config /usr/lib/cli/tao-opengl1.5/
diff --git a/debian/libtao-opengl1.5-cil.installcligac b/debian/libtao-opengl1.5-cil.installcligac
new file mode 100644
index 0000000..ca5e068
--- /dev/null
+++ b/debian/libtao-opengl1.5-cil.installcligac
@@ -0,0 +1,3 @@
+/usr/lib/cli/tao-opengl1.5/Tao.OpenGl.dll
+/usr/lib/cli/tao-opengl1.5/Tao.OpenGl.ExtensionLoader.dll
+/usr/lib/cli/tao-opengl1.5/Tao.OpenGl.Glu.dll
diff --git a/debian/libtao-physfs1.0-cil.install b/debian/libtao-physfs1.0-cil.install
index 2596551..b26f669 100644
--- a/debian/libtao-physfs1.0-cil.install
+++ b/debian/libtao-physfs1.0-cil.install
@@ -1,4 +1,3 @@
-usr/share/pkgconfig/tao-physfs.pc
-usr/lib/tao/Tao.PhysFs.dll
-usr/lib/tao/Tao.PhysFs.dll.config
-usr/lib/mono/gac/Tao.PhysFs
+debian/tao-physfs-1.0.pc /usr/share/pkgconfig/
+dist/bin/Tao.PhysFs.dll /usr/lib/cli/tao-phyfs1.0/
+dist/bin/Tao.PhysFs.dll.config /usr/lib/cli/tao-phyfs1.0/
diff --git a/debian/libtao-physfs1.0-cil.installcligac b/debian/libtao-physfs1.0-cil.installcligac
new file mode 100644
index 0000000..d4bd193
--- /dev/null
+++ b/debian/libtao-physfs1.0-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-phyfs1.0/Tao.PhysFs.dll
diff --git a/debian/libtao-sdl1.2-cil.install b/debian/libtao-sdl1.2-cil.install
index 6689037..b56144c 100644
--- a/debian/libtao-sdl1.2-cil.install
+++ b/debian/libtao-sdl1.2-cil.install
@@ -1,4 +1,3 @@
-usr/share/pkgconfig/tao-sdl.pc
-usr/lib/tao/Tao.Sdl.dll
-usr/lib/tao/Tao.Sdl.dll.config
-usr/lib/mono/gac/Tao.Sdl
+debian/tao-sdl-1.2.pc /usr/share/pkgconfig/
+dist/bin/Tao.Sdl.dll /usr/lib/cli/tao-sdl1.2/
+dist/bin/Tao.Sdl.dll.config /usr/lib/cli/tao-sdl1.2/
diff --git a/debian/libtao-sdl1.2-cil.installcligac b/debian/libtao-sdl1.2-cil.installcligac
new file mode 100644
index 0000000..4fa4d3a
--- /dev/null
+++ b/debian/libtao-sdl1.2-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/tao-sdl1.2/Tao.Sdl.dll
diff --git a/debian/monodoc-tao-manual.install b/debian/monodoc-tao-manual.install
index 7f7c8b3..908adf7 100644
--- a/debian/monodoc-tao-manual.install
+++ b/debian/monodoc-tao-manual.install
@@ -1 +1,3 @@
-usr/lib/monodoc/sources
+dist/doc/Tao.tree /usr/lib/monodoc/sources/
+dist/doc/Tao.zip /usr/lib/monodoc/sources/
+debian/Tao.source /usr/lib/monodoc/sources/
diff --git a/debian/monodoc-tao-manual.prerm b/debian/monodoc-tao-manual.prerm
index 6222d9c..c5f4a07 100644
--- a/debian/monodoc-tao-manual.prerm
+++ b/debian/monodoc-tao-manual.prerm
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
+# Make sure the index is in exactly once
grep -v Tao /usr/lib/monodoc/monodoc.xml \
> /usr/lib/monodoc/monodoc.xml.new
mv /usr/lib/monodoc/monodoc.xml.new \
diff --git a/debian/rules b/debian/rules
index 6a14733..8d1f36f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,42 +67,11 @@ install: build
-find $(CURDIR)/dist -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
-find $(CURDIR)/dist -type f -name "*.exe" | xargs chmod +x
- # Install the compiled stuff into the right place
- mkdir -p $(CURDIR)/debian/tmp/usr/lib/tao
- mkdir -p $(CURDIR)/debian/tmp/usr/share
- mkdir -p $(CURDIR)/debian/tmp/usr/share/doc
-
- for file in $(CURDIR)/dist/bin/Tao.DevIl.dll* \
- $(CURDIR)/dist/bin/Tao.FreeGlut.dll* \
- $(CURDIR)/dist/bin/Tao.Ode.dll* \
- $(CURDIR)/dist/bin/Tao.OpenAl.dll* \
- $(CURDIR)/dist/bin/Tao.OpenGl.dll* \
- $(CURDIR)/dist/bin/Tao.OpenGl.ExtensionLoader.dll* \
- $(CURDIR)/dist/bin/Tao.OpenGl.Glu.dll* \
- $(CURDIR)/dist/bin/Tao.PhysFs.dll* \
- $(CURDIR)/dist/bin/Tao.Sdl.dll*; do \
- cp $$file $(CURDIR)/debian/tmp/usr/lib/tao; \
- done
-
- # Install the documentation
- -mkdir -p $(CURDIR)/debian/tmp/usr/lib/monodoc/sources
- cp $(CURDIR)/dist/doc/Tao.{tree,zip} \
- $(CURDIR)/debian/Tao.source \
- $(CURDIR)/debian/tmp/usr/lib/monodoc/sources
-
- # Install the libraries into GAC
- for file in $(CURDIR)/debian/tmp/usr/lib/tao/*.dll; do \
- gacutil /i $$file -root $(CURDIR)/debian/tmp/usr/lib; \
- done
-
- # Install the pkgconfig files
- mkdir -p $(CURDIR)/debian/tmp/usr/share/pkgconfig
- cp $(CURDIR)/debian/*.pc $(CURDIR)/debian/tmp/usr/share/pkgconfig/
-
binary-indep: build install
dh_testdir
dh_testroot
- dh_install --sourcedir=debian/tmp
+ dh_install
+ dh_installcligac
dh_installchangelogs
dh_installdocs
dh_installexamples
diff --git a/debian/tao-devil.pc b/debian/tao-devil-1.6.pc
similarity index 65%
rename from debian/tao-devil.pc
rename to debian/tao-devil-1.6.pc
index 418a04d..82268eb 100644
--- a/debian/tao-devil.pc
+++ b/debian/tao-devil-1.6.pc
@@ -4,5 +4,5 @@ libdir=${exec_prefix}/lib
Name: Tao.DevIl
Description: DevIl portion of the Tao framework
-Version: 1.2.0
-Libs: -r:${libdir}/tao/Tao.DevIl.dll
+Version: 1.6.7.0
+Libs: -r:${libdir}/cli/tao-devil1.6/Tao.DevIl.dll
diff --git a/debian/tao-freeglut.pc b/debian/tao-freeglut-2.2.pc
similarity index 57%
rename from debian/tao-freeglut.pc
rename to debian/tao-freeglut-2.2.pc
index f429816..05babab 100644
--- a/debian/tao-freeglut.pc
+++ b/debian/tao-freeglut-2.2.pc
@@ -4,6 +4,6 @@ libdir=${exec_prefix}/lib
Name: Tao.FreeGlut
Description: FreeGlut portion of the Tao framework
-Version: 1.2.0
-Requires: tao-opengl
-Libs: -r:${libdir}/tao/Tao.FreeGlut.dll
+Version: 2.2.0.0
+Requires: tao-opengl-1.5
+Libs: -r:${libdir}/cli/tao-freeglut2.2/Tao.FreeGlut.dll
diff --git a/debian/tao-ode.pc b/debian/tao-ode-0.5.pc
similarity index 65%
rename from debian/tao-ode.pc
rename to debian/tao-ode-0.5.pc
index b7aee25..cc31513 100644
--- a/debian/tao-ode.pc
+++ b/debian/tao-ode-0.5.pc
@@ -4,5 +4,5 @@ libdir=${exec_prefix}/lib
Name: Tao.Ode
Description: Ode portion of the Tao framework
-Version: 1.2.0
-Libs: -r:${libdir}/tao/Tao.Ode.dll
+Version: 0.5.0.2
+Libs: -r:${libdir}/cli/tao-ode0.5/Tao.Ode.dll
diff --git a/debian/tao-openal.pc b/debian/tao-openal-1.0.pc
similarity index 63%
rename from debian/tao-openal.pc
rename to debian/tao-openal-1.0.pc
index 89ade80..6e98be1 100644
--- a/debian/tao-openal.pc
+++ b/debian/tao-openal-1.0.pc
@@ -4,5 +4,5 @@ libdir=${exec_prefix}/lib
Name: Tao.OpenAl
Description: OpenAl portion of Tao framework
-Version: 1.2.0
-Libs: -r:${libdir}/tao/Tao.OpenAl.dll
+Version: 1.0.0.2
+Libs: -r:${libdir}/cli/tao-openal1.0/Tao.OpenAl.dll
diff --git a/debian/tao-opengl-1.5.pc b/debian/tao-opengl-1.5.pc
new file mode 100644
index 0000000..49dd3c8
--- /dev/null
+++ b/debian/tao-opengl-1.5.pc
@@ -0,0 +1,8 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+Name: Tao.OpenGl
+Description: OpenGL section of the Tao framework
+Version: 1.5.0.3
+Libs: -r:${libdir}/cli/tao-opengl1.5/Tao.OpenGl.dll -r:${libdir}/cli/tao-opengl1.5/Tao.OpenGl.ExtensionLoader.dll
diff --git a/debian/tao-opengl-glu.pc b/debian/tao-opengl-glu-1.5.pc
similarity index 57%
rename from debian/tao-opengl-glu.pc
rename to debian/tao-opengl-glu-1.5.pc
index d97f6b7..18c0a18 100644
--- a/debian/tao-opengl-glu.pc
+++ b/debian/tao-opengl-glu-1.5.pc
@@ -4,6 +4,6 @@ libdir=${exec_prefix}/lib
Name: Tao.OpenGl.Glu
Description: OpenGL.Glu section of the Tao framework
-Version: 1.2.0
-Requires: tao-opengl
-Libs: -r:${libdir}/tao/Tao.OpenGl.Glu.dll
+Version: 1.5.0.3
+Requires: tao-opengl-1.5
+Libs: -r:${libdir}/cli/tao-opengl1.5/Tao.OpenGl.Glu.dll
diff --git a/debian/tao-opengl.pc b/debian/tao-opengl.pc
deleted file mode 100644
index b441bc9..0000000
--- a/debian/tao-opengl.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: 1.2.0
-Libs: -r:${libdir}/tao/Tao.OpenGl.dll -r:${libdir}/tao/Tao.OpenGl.ExtensionLoader.dll
diff --git a/debian/tao-physfs.pc b/debian/tao-physfs-1.0.pc
similarity index 65%
rename from debian/tao-physfs.pc
rename to debian/tao-physfs-1.0.pc
index 2744b4c..2342a4d 100644
--- a/debian/tao-physfs.pc
+++ b/debian/tao-physfs-1.0.pc
@@ -4,5 +4,5 @@ libdir=${exec_prefix}/lib
Name: Tao.PhysFs
Description: PhysFs section of the Tao framework
-Version: 1.2.0
-Libs: -r:${libdir}/tao/Tao.PhysFs.dll
+Version: 1.0.0.0
+Libs: -r:${libdir}/cli/tao-phyfs1.0/Tao.PhysFs.dll
diff --git a/debian/tao-sdl.pc b/debian/tao-sdl-1.2.pc
similarity index 65%
rename from debian/tao-sdl.pc
rename to debian/tao-sdl-1.2.pc
index 56b4e5f..8628ea0 100644
--- a/debian/tao-sdl.pc
+++ b/debian/tao-sdl-1.2.pc
@@ -4,5 +4,5 @@ libdir=${exec_prefix}/lib
Name: Tao.Sdl
Description: Sdl portion of the Tao framework
-Version: 1.2.0
-Libs: -r:${libdir}/tao/Tao.Sdl.dll
+Version: 1.2.9.1
+Libs: -r:${libdir}/cli/tao-sdl1.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