lp:~noskcaj/ubuntu/vivid/taoframework/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/vivid/taoframework/merge
Branch merges
- Sebastien Bacher: Approve
-
Diff: 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)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 22. By Jackson Doak
-
* Merge from debian. Remaining changes:
- Disable ffmpeg component, not ported to libav9.
* Upstream's domain expired :( — so point to their SF project
* Add missing epochs to libav{codec,format} -dev BDs.
* [417b269,bffdf5b] Refreshed dllmap patches (Closes: #723099)
* [cfdaad9] Refresh Tao.Sdl dependency (Closes: #753465)
* Rebuild against new NUnit (Closes: #762227) - 15. By Iain Lane
-
debian/
patches/ 200_*_update. diff: Update for new libav SONAMEs (in Debian
experimental and Oneiric only. When unstable gets them, we can upload
this patch to Debian and sync again) - 14. By Iain Lane
-
* debian/control:
+ Remove some obsolete BDs (Closes: #627390)
+ Use dh_prep instead of dh_clean
+ Standards-Version → 3.9.2, no changes required
+ ignore optional references to mac libraries (Closes: #627388)
* debian/rules:
+ Use the system default gacutil instead of hardcoding gacutil2
Closes: #627392
+ Use dh_prep instead of dh_clean
* Run wrap-and-sort
* Add README.source taken from quilt package - 13. By Iain Lane
-
* d/control:
+ Rebuild against new ffmpeg, fixing uninstallability due to removed
libavutil{,-extra- }49 (Closes: #618390)
+ Add missing ${misc:Depends} Dependency to monodoc-taoframework- manual
+ Add missing Build-Depends on libsdl-gfx1.2-dev, libalut-dev and
libswscale-dev to have all required binary dependencies correctly
generated from the DLLMaps
+ Standards-Version → 3.9.1, no changes required
* d/README.source: Add, copied from quilt package
* d/patches/200_libavutil_ update: Add new patch to reference new
libavutil SONAME in Tao.FFmpeg's DLLmap
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/taoframework