[Pkg-cli-libs-commits] r4208 - in /packages/taoframework/trunk/debian: changelog patches/200_libavcodec_update.diff patches/210_remove_dllmap_entries.diff patches/series

[sho at users.alioth.debian.org]

Author: sho
Date: Sat Aug  1 13:06:16 2009
New Revision: 4208

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4208
Log:
Revert the dllmap patch. I applied a better one upstream instead.

Removed:
    packages/taoframework/trunk/debian/patches/210_remove_dllmap_entries.diff
Modified:
    packages/taoframework/trunk/debian/changelog
    packages/taoframework/trunk/debian/patches/200_libavcodec_update.diff
    packages/taoframework/trunk/debian/patches/series

Modified: packages/taoframework/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/changelog?rev=4208&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/changelog (original)
+++ packages/taoframework/trunk/debian/changelog Sat Aug  1 13:06:16 2009
@@ -11,10 +11,6 @@
 
   * 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
 

Modified: packages/taoframework/trunk/debian/patches/200_libavcodec_update.diff
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/patches/200_libavcodec_update.diff?rev=4208&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/patches/200_libavcodec_update.diff (original)
+++ packages/taoframework/trunk/debian/patches/200_libavcodec_update.diff Sat Aug  1 13:06:16 2009
@@ -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" />

Modified: packages/taoframework/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk/debian/patches/series?rev=4208&op=diff
==============================================================================
--- packages/taoframework/trunk/debian/patches/series (original)
+++ packages/taoframework/trunk/debian/patches/series Sat Aug  1 13:06:16 2009
@@ -1,2 +1,1 @@
 200_libavcodec_update.diff
-210_remove_dllmap_entries.diff