[Pkg-cli-libs-commits] [taoframework] 63/91: Revert the dllmap patch. I applied a better one upstream instead.
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 0318095719b906e390bf79148cb7b18e43c6188e
Author: Sam Hocevar <sam at zoy.org>
Date: Sat Aug 1 13:06:16 2009 +0000
Revert the dllmap patch. I applied a better one upstream instead.
---
debian/changelog | 4 -
debian/patches/200_libavcodec_update.diff | 21 +--
debian/patches/210_remove_dllmap_entries.diff | 227 --------------------------
debian/patches/series | 1 -
4 files changed, 11 insertions(+), 242 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fa877f3..e8b7071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,10 +12,6 @@ taoframework (2.1.svn20090801-1) unstable; urgency=low
* debian/patches/200_libavcodec_update.diff:
+ New patch. Reference libavcodec.so.52 instead of 51 (Closes: #516921).
- * debian/patches/210_remove_dllmap_entries.diff:
- + New patch. Add target= attributes to <dllmap> tags until dh_clideps
- support the <dllentry> scheme.
-
-- Sam Hocevar <sho at debian.org> Sun, 15 Feb 2009 12:05:23 +0000
taoframework (2.1.svn20090213-1) UNRELEASED; urgency=low
diff --git a/debian/patches/200_libavcodec_update.diff b/debian/patches/200_libavcodec_update.diff
index c8eff6a..1136f40 100644
--- a/debian/patches/200_libavcodec_update.diff
+++ b/debian/patches/200_libavcodec_update.diff
@@ -1,12 +1,13 @@
-Index: taoframework-2.1.svn20090215/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.1.svn20090215.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-03-20 01:20:33.000000000 +0100
-+++ taoframework-2.1.svn20090215/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-03-20 01:20:38.000000000 +0100
-@@ -1,6 +1,6 @@
+--- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-08-01 12:57:29.000000000 +0000
++++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-08-01 13:05:04.000000000 +0000
+@@ -1,7 +1,7 @@
<configuration>
- <dllmap dll="avcodec-51.dll">
-- <dllentry os="linux" dll="libavcodec.so.51" />
-+ <dllentry os="linux" dll="libavcodec.so.52" />
- <dllentry os="windows" dll="avcodec-51.dll" />
- <dllentry os="osx" dll="libavcodec.so.51" />
- </dllmap>
+ <dllmap dll="avcodec-51.dll" os="windows" dll="avcodec-51.dll" />
+ <dllmap dll="avcodec-51.dll" os="osx" dll="libavcodec.so.51" />
+- <dllmap dll="avcodec-51.dll" os="!windows,osx" dll="libavcodec.so.51" />
++ <dllmap dll="avcodec-51.dll" os="!windows,osx" dll="libavcodec.so.52" />
+
+ <dllmap dll="avformat-52.dll" os="windows" dll="avformat-52.dll" />
+ <dllmap dll="avformat-52.dll" os="osx" dll="libavformat.so.52" />
diff --git a/debian/patches/210_remove_dllmap_entries.diff b/debian/patches/210_remove_dllmap_entries.diff
deleted file mode 100644
index b93e52c..0000000
--- a/debian/patches/210_remove_dllmap_entries.diff
+++ /dev/null
@@ -1,227 +0,0 @@
-Index: taoframework-2.1.svn20090801/src/Tao.Cg/Tao.Cg.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Cg/Tao.Cg.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Cg/Tao.Cg.dll.config 2009-08-01 11:59:37.000000000 +0000
-@@ -1,10 +1,10 @@
- <configuration>
-- <dllmap dll="cg.dll">
-+ <dllmap dll="cg.dll" target="libCg.so">
- <dllentry os="linux" dll="libCg.so" />
- <dllentry os="windows" dll="cg.dll" />
- <dllentry os="osx" dll="/Library/Frameworks/Cg.framework/Cg" />
- </dllmap>
-- <dllmap dll="cgGL.dll">
-+ <dllmap dll="cgGL.dll" target="libCgGL.so">
- <dllentry os="linux" dll="libCgGL.so" />
- <dllentry os="windows" dll="cgGL.dll" />
- <dllentry os="osx" dll="/Library/Frameworks/Cg.framework/Cg" />
-Index: taoframework-2.1.svn20090801/src/Tao.DevIl/Tao.DevIl.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.DevIl/Tao.DevIl.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.DevIl/Tao.DevIl.dll.config 2009-08-01 11:59:52.000000000 +0000
-@@ -1,15 +1,15 @@
- <configuration>
-- <dllmap dll="DevIL.dll">
-+ <dllmap dll="DevIL.dll" target="libIL.so.1">
- <dllentry os="linux" dll="libIL.so.1" />
- <dllentry os="windows" dll="DevIl.dll" />
- <dllentry os="osx" dll="libIL.so.1" />
- </dllmap>
-- <dllmap dll="ILU.dll">
-+ <dllmap dll="ILU.dll" target="libILU.so.1">
- <dllentry os="linux" dll="libILU.so.1" />
- <dllentry os="windows" dll="ILU.dll" />
- <dllentry os="osx" dll="libILU.so.1" />
- </dllmap>
-- <dllmap dll="ILUT.dll">
-+ <dllmap dll="ILUT.dll" target="libILUT.so.1">
- <dllentry os="linux" dll="libILUT.so.1" />
- <dllentry os="windows" dll="ILUT.dll" />
- <dllentry os="osx" dll="libILUT.so.1" />
-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-08-01 12:00:14.000000000 +0000
-@@ -1,20 +1,20 @@
- <configuration>
-- <dllmap dll="avcodec-51.dll">
-+ <dllmap dll="avcodec-51.dll" target="libavcodec.so.52">
- <dllentry os="linux" dll="libavcodec.so.52" />
- <dllentry os="windows" dll="avcodec-51.dll" />
- <dllentry os="osx" dll="libavcodec.so.51" />
- </dllmap>
-- <dllmap dll="avformat-52.dll">
-+ <dllmap dll="avformat-52.dll" target="libavformat.so.52">
- <dllentry os="linux" dll="libavformat.so.52" />
- <dllentry os="windows" dll="avformat-52.dll" />
- <dllentry os="osx" dll="libavformat.so.52" />
- </dllmap>
-- <dllmap dll="avutil-49.dll">
-+ <dllmap dll="avutil-49.dll" target="libavutil.so.49">
- <dllentry os="linux" dll="libavutil.so.49" />
- <dllentry os="windows" dll="avutil-49.dll" />
- <dllentry os="osx" dll="libavutil.so.49" />
- </dllmap>
-- <dllmap dll="swscale-0.dll">
-+ <dllmap dll="swscale-0.dll" target="libswscale.so.0">
- <dllentry os="linux" dll="libswscale.so.0" />
- <dllentry os="windows" dll="swscale-0.dll" />
- <dllentry os="osx" dll="libswscale.so.0" />
-Index: taoframework-2.1.svn20090801/src/Tao.FreeGlut/Tao.FreeGlut.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FreeGlut/Tao.FreeGlut.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.FreeGlut/Tao.FreeGlut.dll.config 2009-08-01 12:00:21.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="freeglut.dll">
-+ <dllmap dll="freeglut.dll" target="libglut.so.3">
- <dllentry os="linux" dll="libglut.so.3" />
- <dllentry os="windows" dll="freeglut.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/GLUT.framework/GLUT" />
-Index: taoframework-2.1.svn20090801/src/Tao.FreeType/Tao.FreeType.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FreeType/Tao.FreeType.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.FreeType/Tao.FreeType.dll.config 2009-08-01 12:00:27.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="freetype6.dll">
-+ <dllmap dll="freetype6.dll" target="libfreetype.so.6">
- <dllentry os="linux" dll="libfreetype.so.6" />
- <dllentry os="windows" dll="freetype6.dll" />
- <dllentry os="osx" dll="/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib" />
-Index: taoframework-2.1.svn20090801/src/Tao.FtGl/Tao.FtGl.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FtGl/Tao.FtGl.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.FtGl/Tao.FtGl.dll.config 2009-08-01 12:00:33.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="ftgl.dll">
-+ <dllmap dll="ftgl.dll" target="libftgl.so.2">
- <dllentry os="linux" dll="libftgl.so.2"/>
- <dllentry os="windows" dll="ftgl.dll"/>
- <dllentry os="osx" dll="libftgl.so.2" />
-Index: taoframework-2.1.svn20090801/src/Tao.Glfw/Tao.Glfw.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Glfw/Tao.Glfw.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Glfw/Tao.Glfw.dll.config 2009-08-01 12:00:38.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="glfw.dll">
-+ <dllmap dll="glfw.dll" target="libglfw.so.2">
- <dllentry os="linux" dll="libglfw.so.2" />
- <dllentry os="windows" dll="glfw.dll" />
- <dllentry os="osx" dll="libglfw.so.2" />
-Index: taoframework-2.1.svn20090801/src/Tao.Lua/Tao.Lua.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Lua/Tao.Lua.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Lua/Tao.Lua.dll.config 2009-08-01 12:00:44.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="lua5.1.dll">
-+ <dllmap dll="lua5.1.dll" target="liblua5.1.so.0">
- <dllentry os="linux" dll="liblua5.1.so.0" />
- <dllentry os="windows" dll="lua5.1.dll" />
- <dllentry os="osx" dll="liblua5.1.so.0" />
-Index: taoframework-2.1.svn20090801/src/Tao.Ode/Tao.Ode.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Ode/Tao.Ode.dll.config 2009-08-01 11:59:19.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Ode/Tao.Ode.dll.config 2009-08-01 12:00:51.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="ode.dll">
-+ <dllmap dll="ode.dll" target="libode.so.0debian1">
- <dllentry os="linux" dll="libode.so.0debian1" />
- <dllentry os="windows" dll="ode.dll" />
- <dllentry os="osx" dll="libode.so.0debian1" />
-Index: taoframework-2.1.svn20090801/src/Tao.OpenAl/Tao.OpenAl.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.OpenAl/Tao.OpenAl.dll.config 2009-08-01 11:59:20.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.OpenAl/Tao.OpenAl.dll.config 2009-08-01 12:01:03.000000000 +0000
-@@ -1,10 +1,10 @@
- <configuration>
-- <dllmap dll="OpenAL32.dll">
-+ <dllmap dll="OpenAL32.dll" target="libopenal.so.1">
- <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="alut.dll">
-+ <dllmap dll="alut.dll" target="libalut.so.1">
- <dllentry os="linux" dll="libalut.so.1" />
- <dllentry os="windows" dll="alut.dll" />
- <dllentry os="osx" dll="libalut.so.0" />
-Index: taoframework-2.1.svn20090801/src/Tao.OpenGl/Tao.OpenGl.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.OpenGl/Tao.OpenGl.dll.config 2009-08-01 11:59:20.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.OpenGl/Tao.OpenGl.dll.config 2009-08-01 12:01:16.000000000 +0000
-@@ -1,10 +1,10 @@
- <configuration>
-- <dllmap dll="opengl32.dll">
-+ <dllmap dll="opengl32.dll" target="libGL.so.1">
- <dllentry os="linux" dll="libGL.so.1" />
- <dllentry os="windows" dll="opengl32.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/OpenGL" />
- </dllmap>
-- <dllmap dll="glu32.dll">
-+ <dllmap dll="glu32.dll" target="libGLU.so.1">
- <dllentry os="linux" dll="libGLU.so.1" />
- <dllentry os="windows" dll="opengl32.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib" />
-Index: taoframework-2.1.svn20090801/src/Tao.PhysFs/Tao.PhysFs.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.PhysFs/Tao.PhysFs.dll.config 2009-08-01 11:59:20.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.PhysFs/Tao.PhysFs.dll.config 2009-08-01 12:01:23.000000000 +0000
-@@ -1,5 +1,5 @@
- <configuration>
-- <dllmap dll="physfs.dll">
-+ <dllmap dll="physfs.dll" target="libphysfs-1.0.so.0">
- <dllentry os="linux" dll="libphysfs-1.0.so.0" />
- <dllentry os="windows" dll="physfs.dll" />
- <dllentry os="osx" dll="libphysfs-1.0.so.0" />
-Index: taoframework-2.1.svn20090801/src/Tao.Sdl/Tao.Sdl.dll.config
-===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Sdl/Tao.Sdl.dll.config 2009-08-01 11:59:20.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Sdl/Tao.Sdl.dll.config 2009-08-01 12:02:03.000000000 +0000
-@@ -1,35 +1,35 @@
- <configuration>
-- <dllmap dll="SDL.dll">
-+ <dllmap dll="SDL.dll" target="libSDL-1.2.so.0">
- <dllentry os="linux" dll="libSDL-1.2.so.0"/>
- <dllentry os="windows" dll="SDL.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/SDL.framework/SDL" />
- </dllmap>
-- <dllmap dll="SDL_image.dll">
-+ <dllmap dll="SDL_image.dll" target="libSDL_image-1.2.so.0">
- <dllentry os="linux" dll="libSDL_image-1.2.so.0" />
- <dllentry os="windows" dll="SDL_image.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/SDL_image.framework/SDL_image" />
- </dllmap>
-- <dllmap dll="SDL_mixer.dll">
-+ <dllmap dll="SDL_mixer.dll" target="libSDL_mixer-1.2.so.0">
- <dllentry os="linux" dll="libSDL_mixer-1.2.so.0" />
- <dllentry os="windows" dll="SDL_mixer.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/SDL_mixer.framework/SDL_mixer" />
- </dllmap>
-- <dllmap dll="SDL_ttf.dll">
-+ <dllmap dll="SDL_ttf.dll" target="libSDL_ttf-2.0.so.0">
- <dllentry os="linux" dll="libSDL_ttf-2.0.so.0" />
- <dllentry os="windows" dll="SDL_ttf.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/SDL_ttf.framework/SDL_ttf" />
- </dllmap>
-- <dllmap dll="SDL_net.dll">
-+ <dllmap dll="SDL_net.dll" target="libSDL_net-1.2.so.0">
- <dllentry os="linux" dll="libSDL_net-1.2.so.0" />
- <dllentry os="windows" dll="SDL_net.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/SDL_net.framework/SDL_net" />
- </dllmap>
-- <dllmap dll="smpeg.dll">
-+ <dllmap dll="smpeg.dll" target="libsmpeg-0.4.so.0">
- <dllentry os="linux" dll="libsmpeg-0.4.so.0" />
- <dllentry os="windows" dll="smpeg.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/smpeg.framework/smpeg" />
- </dllmap>
-- <dllmap dll="SDL_gfx.dll">
-+ <dllmap dll="SDL_gfx.dll" target="libSDL_gfx.so.4">
- <dllentry os="linux" dll="libSDL_gfx.so.4" />
- <dllentry os="windows" dll="SDL_gfx.dll"/>
- <dllentry os="osx" dll="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
diff --git a/debian/patches/series b/debian/patches/series
index ed27d4a..ff37eec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
200_libavcodec_update.diff
-210_remove_dllmap_entries.diff
--
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