[Pkg-cli-libs-commits] [taoframework] 01/03: Fix line endings in last commit
Jo Shields
directhex at moszumanska.debian.org
Mon Sep 22 09:02:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to annotated tag debian/2.1.svn20090801-10
in repository taoframework.
commit bffdf5bf85255d2975b6cfa837479cc43b10823c
Author: Jo Shields <jo.shields at xamarin.com>
Date: Mon Sep 22 09:52:54 2014 +0100
Fix line endings in last commit
---
debian/patches/200_libavcodec_update.diff | 22 +++++++++++-----------
debian/patches/200_libavformat_update | 22 +++++++++++-----------
debian/patches/200_libavutil_update.diff | 22 +++++++++++-----------
debian/patches/200_libswscale_update | 18 +++++++++---------
4 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/debian/patches/200_libavcodec_update.diff b/debian/patches/200_libavcodec_update.diff
index d4c095e..8789d11 100644
--- a/debian/patches/200_libavcodec_update.diff
+++ b/debian/patches/200_libavcodec_update.diff
@@ -1,13 +1,13 @@
-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-08-01 14:21:36.000000000 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:11:09.586279009 +0100
+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:50:46.241152264 +0100
++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:05.853152273 +0100
@@ -1,7 +1,7 @@
- <configuration>
- <dllmap dll="avcodec-51.dll" os="windows" target="avcodec-51.dll" />
- <dllmap dll="avcodec-51.dll" os="osx" target="libavcodec.so.51" />
-- <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.51" />
-+ <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.56" />
-
- <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
- <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
+ <configuration>
+ <dllmap dll="avcodec-51.dll" os="windows" target="avcodec-51.dll" />
+ <dllmap dll="avcodec-51.dll" os="osx" target="libavcodec.so.51" />
+- <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.51" />
++ <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.56" />
+
+ <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
+ <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
diff --git a/debian/patches/200_libavformat_update b/debian/patches/200_libavformat_update
index 7815025..6329beb 100644
--- a/debian/patches/200_libavformat_update
+++ b/debian/patches/200_libavformat_update
@@ -1,13 +1,13 @@
-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:16:13.234340805 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:17:04.096341536 +0100
+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:48.209152294 +0100
++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:52:06.117152302 +0100
@@ -5,7 +5,7 @@
-
- <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
- <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
-- <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.52" />
-+ <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.56" />
-
- <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
- <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
+
+ <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
+ <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
+- <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.52" />
++ <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.56" />
+
+ <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
+ <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
diff --git a/debian/patches/200_libavutil_update.diff b/debian/patches/200_libavutil_update.diff
index e8ac09c..1527835 100644
--- a/debian/patches/200_libavutil_update.diff
+++ b/debian/patches/200_libavutil_update.diff
@@ -1,16 +1,16 @@
Description: Update Tao.FFmpeg DLLmap to reference correct avutil SONAME
Author: Iain Lane <laney at ubuntu.com>
-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-04-01 21:59:32.752639376 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-04-01 22:00:02.525729924 +0100
+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:21.445152281 +0100
++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:38.741152289 +0100
@@ -9,7 +9,7 @@
-
- <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
- <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
-- <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.49" />
-+ <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.54" />
-
- <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
- <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
+
+ <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
+ <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
+- <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.49" />
++ <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.54" />
+
+ <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
+ <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
diff --git a/debian/patches/200_libswscale_update b/debian/patches/200_libswscale_update
index 9fe092e..25e4736 100644
--- a/debian/patches/200_libswscale_update
+++ b/debian/patches/200_libswscale_update
@@ -1,11 +1,11 @@
-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:16:53.556755810 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:16:58.652555514 +0100
+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:52:14.941152307 +0100
++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:52:35.085152317 +0100
@@ -13,5 +13,5 @@
-
- <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
- <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
-- <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.0" />
-+ <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.3" />
- </configuration>
+
+ <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
+ <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
+- <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.0" />
++ <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.3" />
+ </configuration>
--
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