Merge lp:~noskcaj/ubuntu/vivid/taoframework/merge into lp:ubuntu/vivid/taoframework

[Jackson Doak]

Merge from debian. nunit transition

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2014-12-30 07:00:55 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2014-12-30 07:00:55 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2014-12-30 07:00:55 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-01 12:11:06 +0000
+++ debian/changelog	2014-12-30 07:00:55 +0000
@@ -1,3 +1,23 @@
+taoframework (2.1.svn20090801-10ubuntu1) vivid; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - Disable ffmpeg component, not ported to libav9.
+
+ -- Jackson Doak <[e-mail]>  Tue, 30 Dec 2014 17:57:37 +1100
+
+taoframework (2.1.svn20090801-10) unstable; urgency=low
+
+  [ Iain Lane ]
+  * Upstream's domain expired :( — so point to their SF project 
+  * Add missing epochs to libav{codec,format}-dev BDs. 
+
+  [ Jo Shields ]
+  * [417b269,bffdf5b] Refreshed dllmap patches (Closes: #723099)
+  * [cfdaad9] Refresh Tao.Sdl dependency (Closes: #753465)
+  * Rebuild against new NUnit (Closes: #762227)
+
+ -- Iain Lane <[e-mail]>  Thu, 07 Jun 2012 09:08:58 +0100
+
 taoframework (2.1.svn20090801-9ubuntu3) utopic; urgency=medium
 
   * Bump expected SDL_gfx SONAME to libSDL_gfx.so.15.

=== modified file 'debian/control'
--- debian/control	2014-05-01 12:11:06 +0000
+++ debian/control	2014-12-30 07:00:55 +0000
@@ -10,8 +10,8 @@
 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
                      freeglut3-dev,
                      libalut-dev,
-#                    libavcodec-dev (>= 3:0.svn20090303),
-#                    libavformat-dev (>= 3:0.svn20090303),
+#                     libavcodec-dev (>= 5:3:0.svn20090303),
+#                     libavformat-dev (>= 5:3:0.svn20090303),
                      libdevil-dev,
                      libfreetype6-dev,
                      libftgl-dev,
@@ -36,7 +36,7 @@
 Standards-Version: 3.9.2
 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
-Homepage: http://www.taoframework.com/
+Homepage: http://sourceforge.net/projects/taoframework/
 
 Package: taoframework-examples
 Architecture: all

=== removed file 'debian/patches/200_libSDL_gfx_update.diff'
--- debian/patches/200_libSDL_gfx_update.diff	2014-05-01 12:11:06 +0000
+++ debian/patches/200_libSDL_gfx_update.diff	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Index: b/src/Tao.Sdl/Tao.Sdl.dll.config
-===================================================================
---- a/src/Tao.Sdl/Tao.Sdl.dll.config
-+++ b/src/Tao.Sdl/Tao.Sdl.dll.config
-@@ -25,5 +25,5 @@
- 
-     <dllmap dll="SDL_gfx.dll" os="windows" target="SDL_gfx.dll"/>
-     <dllmap dll="SDL_gfx.dll" os="osx" target="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
--    <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.13" />
-+    <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.15" />
- </configuration>

=== modified file 'debian/patches/200_libavcodec_update.diff'
--- debian/patches/200_libavcodec_update.diff	2011-09-03 19:05:38 +0000
+++ debian/patches/200_libavcodec_update.diff	2014-12-30 07:00:55 +0000
@@ -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.53" />
++    <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" />

=== modified file 'debian/patches/200_libavformat_update'
--- debian/patches/200_libavformat_update	2011-09-03 19:05:38 +0000
+++ debian/patches/200_libavformat_update	2014-12-30 07:00:55 +0000
@@ -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.53" />
++    <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" />

=== modified file 'debian/patches/200_libavutil_update.diff'
--- debian/patches/200_libavutil_update.diff	2011-09-03 19:05:38 +0000
+++ debian/patches/200_libavutil_update.diff	2014-12-30 07:00:55 +0000
@@ -1,16 +1,16 @@
 Description: Update Tao.FFmpeg DLLmap to reference correct avutil SONAME
 Author: Iain Lane <[e-mail]>
 
-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.51" />
++    <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" />

=== modified file 'debian/patches/200_libswscale_update'
--- debian/patches/200_libswscale_update	2011-09-03 19:05:38 +0000
+++ debian/patches/200_libswscale_update	2014-12-30 07:00:55 +0000
@@ -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.2" />
++    <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.3" />
  </configuration>

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-05-01 12:11:06 +0000
+++ debian/patches/series	2014-12-30 07:00:55 +0000
@@ -1,3 +1,4 @@
+update_Tao.Sdl_dllmap.patch
 500_dont_rename_pcfiles.diff
 400_cli_policy_0.7_pcfiles.diff
 300_libode_update.diff
@@ -6,4 +7,3 @@
 200_libx11_dllmap.diff
 200_libavformat_update
 200_libswscale_update
-200_libSDL_gfx_update.diff

=== added file 'debian/patches/update_Tao.Sdl_dllmap.patch'
--- debian/patches/update_Tao.Sdl_dllmap.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/update_Tao.Sdl_dllmap.patch	2014-12-30 07:00:55 +0000
@@ -0,0 +1,11 @@
+Index: taoframework/src/Tao.Sdl/Tao.Sdl.dll.config
+===================================================================
+--- taoframework.orig/src/Tao.Sdl/Tao.Sdl.dll.config	2014-09-22 09:38:18.989151901 +0100
++++ taoframework/src/Tao.Sdl/Tao.Sdl.dll.config	2014-09-22 09:57:15.257152452 +0100
+@@ -25,5 +25,5 @@
+ 
+     <dllmap dll="SDL_gfx.dll" os="windows" target="SDL_gfx.dll"/>
+     <dllmap dll="SDL_gfx.dll" os="osx" target="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
+-    <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.13" />
++    <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.15" />
+ </configuration>