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

Proposed by Jackson Doak on 2014-12-30
Status: Merged
Approved by: Sebastien Bacher on 2015-01-06
Approved revision: 22
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~noskcaj/ubuntu/vivid/taoframework/merge
Merge into: lp:ubuntu/vivid/taoframework
Diff against target: 205 lines (+54/-31)
12 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/.version (+1/-0)
debian/changelog (+20/-0)
debian/control (+3/-3)
debian/patches/200_libSDL_gfx_update.diff (+0/-11)
debian/patches/200_libavcodec_update.diff (+4/-4)
debian/patches/200_libavformat_update (+4/-4)
debian/patches/200_libavutil_update.diff (+4/-4)
debian/patches/200_libswscale_update (+4/-4)
debian/patches/series (+1/-1)
debian/patches/update_Tao.Sdl_dllmap.patch (+11/-0)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/vivid/taoframework/merge
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-12-30 Approve on 2015-01-06
Review via email: mp+245440@code.launchpad.net

Description of the change

Merge from debian. nunit transition

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== added file '.pc/.quilt_patches'
3--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
4+++ .pc/.quilt_patches 2014-12-30 07:00:55 +0000
5@@ -0,0 +1,1 @@
6+debian/patches
7
8=== added file '.pc/.quilt_series'
9--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
10+++ .pc/.quilt_series 2014-12-30 07:00:55 +0000
11@@ -0,0 +1,1 @@
12+series
13
14=== added file '.pc/.version'
15--- .pc/.version 1970-01-01 00:00:00 +0000
16+++ .pc/.version 2014-12-30 07:00:55 +0000
17@@ -0,0 +1,1 @@
18+2
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2014-05-01 12:11:06 +0000
22+++ debian/changelog 2014-12-30 07:00:55 +0000
23@@ -1,3 +1,23 @@
24+taoframework (2.1.svn20090801-10ubuntu1) vivid; urgency=medium
25+
26+ * Merge from debian. Remaining changes:
27+ - Disable ffmpeg component, not ported to libav9.
28+
29+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 30 Dec 2014 17:57:37 +1100
30+
31+taoframework (2.1.svn20090801-10) unstable; urgency=low
32+
33+ [ Iain Lane ]
34+ * Upstream's domain expired :( — so point to their SF project
35+ * Add missing epochs to libav{codec,format}-dev BDs.
36+
37+ [ Jo Shields ]
38+ * [417b269,bffdf5b] Refreshed dllmap patches (Closes: #723099)
39+ * [cfdaad9] Refresh Tao.Sdl dependency (Closes: #753465)
40+ * Rebuild against new NUnit (Closes: #762227)
41+
42+ -- Iain Lane <laney@debian.org> Thu, 07 Jun 2012 09:08:58 +0100
43+
44 taoframework (2.1.svn20090801-9ubuntu3) utopic; urgency=medium
45
46 * Bump expected SDL_gfx SONAME to libSDL_gfx.so.15.
47
48=== modified file 'debian/control'
49--- debian/control 2014-05-01 12:11:06 +0000
50+++ debian/control 2014-12-30 07:00:55 +0000
51@@ -10,8 +10,8 @@
52 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
53 freeglut3-dev,
54 libalut-dev,
55-# libavcodec-dev (>= 3:0.svn20090303),
56-# libavformat-dev (>= 3:0.svn20090303),
57+# libavcodec-dev (>= 5:3:0.svn20090303),
58+# libavformat-dev (>= 5:3:0.svn20090303),
59 libdevil-dev,
60 libfreetype6-dev,
61 libftgl-dev,
62@@ -36,7 +36,7 @@
63 Standards-Version: 3.9.2
64 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/taoframework/trunk
65 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/taoframework/trunk?op=log
66-Homepage: http://www.taoframework.com/
67+Homepage: http://sourceforge.net/projects/taoframework/
68
69 Package: taoframework-examples
70 Architecture: all
71
72=== removed file 'debian/patches/200_libSDL_gfx_update.diff'
73--- debian/patches/200_libSDL_gfx_update.diff 2014-05-01 12:11:06 +0000
74+++ debian/patches/200_libSDL_gfx_update.diff 1970-01-01 00:00:00 +0000
75@@ -1,11 +0,0 @@
76-Index: b/src/Tao.Sdl/Tao.Sdl.dll.config
77-===================================================================
78---- a/src/Tao.Sdl/Tao.Sdl.dll.config
79-+++ b/src/Tao.Sdl/Tao.Sdl.dll.config
80-@@ -25,5 +25,5 @@
81-
82- <dllmap dll="SDL_gfx.dll" os="windows" target="SDL_gfx.dll"/>
83- <dllmap dll="SDL_gfx.dll" os="osx" target="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
84-- <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.13" />
85-+ <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.15" />
86- </configuration>
87
88=== modified file 'debian/patches/200_libavcodec_update.diff'
89--- debian/patches/200_libavcodec_update.diff 2011-09-03 19:05:38 +0000
90+++ debian/patches/200_libavcodec_update.diff 2014-12-30 07:00:55 +0000
91@@ -1,13 +1,13 @@
92-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
93+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
94 ===================================================================
95---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2009-08-01 14:21:36.000000000 +0100
96-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:11:09.586279009 +0100
97+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:50:46.241152264 +0100
98++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:05.853152273 +0100
99 @@ -1,7 +1,7 @@
100 <configuration>
101 <dllmap dll="avcodec-51.dll" os="windows" target="avcodec-51.dll" />
102 <dllmap dll="avcodec-51.dll" os="osx" target="libavcodec.so.51" />
103 - <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.51" />
104-+ <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.53" />
105++ <dllmap dll="avcodec-51.dll" os="!windows,osx" target="libavcodec.so.56" />
106
107 <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
108 <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
109
110=== modified file 'debian/patches/200_libavformat_update'
111--- debian/patches/200_libavformat_update 2011-09-03 19:05:38 +0000
112+++ debian/patches/200_libavformat_update 2014-12-30 07:00:55 +0000
113@@ -1,13 +1,13 @@
114-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
115+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
116 ===================================================================
117---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:16:13.234340805 +0100
118-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:17:04.096341536 +0100
119+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:48.209152294 +0100
120++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:52:06.117152302 +0100
121 @@ -5,7 +5,7 @@
122
123 <dllmap dll="avformat-52.dll" os="windows" target="avformat-52.dll" />
124 <dllmap dll="avformat-52.dll" os="osx" target="libavformat.so.52" />
125 - <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.52" />
126-+ <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.53" />
127++ <dllmap dll="avformat-52.dll" os="!windows,osx" target="libavformat.so.56" />
128
129 <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
130 <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
131
132=== modified file 'debian/patches/200_libavutil_update.diff'
133--- debian/patches/200_libavutil_update.diff 2011-09-03 19:05:38 +0000
134+++ debian/patches/200_libavutil_update.diff 2014-12-30 07:00:55 +0000
135@@ -1,16 +1,16 @@
136 Description: Update Tao.FFmpeg DLLmap to reference correct avutil SONAME
137 Author: Iain Lane <laney@ubuntu.com>
138
139-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
140+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
141 ===================================================================
142---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-04-01 21:59:32.752639376 +0100
143-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-04-01 22:00:02.525729924 +0100
144+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:21.445152281 +0100
145++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:51:38.741152289 +0100
146 @@ -9,7 +9,7 @@
147
148 <dllmap dll="avutil-49.dll" os="windows" target="avutil-49.dll" />
149 <dllmap dll="avutil-49.dll" os="osx" target="libavutil.so.49" />
150 - <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.49" />
151-+ <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.51" />
152++ <dllmap dll="avutil-49.dll" os="!windows,osx" target="libavutil.so.54" />
153
154 <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
155 <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
156
157=== modified file 'debian/patches/200_libswscale_update'
158--- debian/patches/200_libswscale_update 2011-09-03 19:05:38 +0000
159+++ debian/patches/200_libswscale_update 2014-12-30 07:00:55 +0000
160@@ -1,11 +1,11 @@
161-Index: taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
162+Index: taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config
163 ===================================================================
164---- taoframework-2.1.svn20090801.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:16:53.556755810 +0100
165-+++ taoframework-2.1.svn20090801/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2011-09-03 19:16:58.652555514 +0100
166+--- taoframework.orig/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:52:14.941152307 +0100
167++++ taoframework/src/Tao.FFmpeg/Tao.FFmpeg.dll.config 2014-09-22 09:52:35.085152317 +0100
168 @@ -13,5 +13,5 @@
169
170 <dllmap dll="swscale-0.dll" os="windows" target="swscale-0.dll" />
171 <dllmap dll="swscale-0.dll" os="osx" target="libswscale.so.0" />
172 - <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.0" />
173-+ <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.2" />
174++ <dllmap dll="swscale-0.dll" os="!windows,osx" target="libswscale.so.3" />
175 </configuration>
176
177=== modified file 'debian/patches/series'
178--- debian/patches/series 2014-05-01 12:11:06 +0000
179+++ debian/patches/series 2014-12-30 07:00:55 +0000
180@@ -1,3 +1,4 @@
181+update_Tao.Sdl_dllmap.patch
182 500_dont_rename_pcfiles.diff
183 400_cli_policy_0.7_pcfiles.diff
184 300_libode_update.diff
185@@ -6,4 +7,3 @@
186 200_libx11_dllmap.diff
187 200_libavformat_update
188 200_libswscale_update
189-200_libSDL_gfx_update.diff
190
191=== added file 'debian/patches/update_Tao.Sdl_dllmap.patch'
192--- debian/patches/update_Tao.Sdl_dllmap.patch 1970-01-01 00:00:00 +0000
193+++ debian/patches/update_Tao.Sdl_dllmap.patch 2014-12-30 07:00:55 +0000
194@@ -0,0 +1,11 @@
195+Index: taoframework/src/Tao.Sdl/Tao.Sdl.dll.config
196+===================================================================
197+--- taoframework.orig/src/Tao.Sdl/Tao.Sdl.dll.config 2014-09-22 09:38:18.989151901 +0100
198++++ taoframework/src/Tao.Sdl/Tao.Sdl.dll.config 2014-09-22 09:57:15.257152452 +0100
199+@@ -25,5 +25,5 @@
200+
201+ <dllmap dll="SDL_gfx.dll" os="windows" target="SDL_gfx.dll"/>
202+ <dllmap dll="SDL_gfx.dll" os="osx" target="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
203+- <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.13" />
204++ <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.15" />
205+ </configuration>

Subscribers

People subscribed via source and target branches

to all changes: