lp:~ubuntu-branches/ubuntu/oneiric/mediatomb/oneiric-201106030110
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/oneiric/mediatomb/oneiric-201106030110
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 126 lines (+108/-0) (has conflicts)3 files modifieddebian/mediatomb-daemon.mediatomb.upstart (+34/-0)
debian/patches/libav_0.7_support.patch (+64/-0)
debian/patches/mediatomb-0.12.1-gcc46.patch (+10/-0)
Related source package recipes
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 17. By Luke Yelavich
-
Merge lp:~broder/ubuntu/oneiric/mediatomb/fix-212441-and-770964 which is based
on lp:vanvugt/ubuntu/oneiric/mediatomb/fix-212441 - 16. By Micah Gersten
-
* New upstream release (LP: #553269)
+ Drop patches applied upstream:
- drop debian/patches/ service- id_fix. patch
- drop debian/patches/ ffmpegthumbnail er-2.0. patch
- drop debian/patches/ autoreconf_ -fi.patch
+ Refresh patch due to upstream changes
- update debian/patches/ const_char_ conversion. patch * Merge from debian unstable. Remaining changes:
- debian/control:
+ Don't depend on libmozjs-dev
+ Add OR depends on abrowser
- debian/rules: Disable js support
- fix LP: #569763 - mediatomb allows anyone to browse and export the whole
filesystem - 14. By Chris Coulson
-
* debian/rules:
- Disable spidermonkey support (LP: #536643)
* debian/control:
- Don't build-depend on libmozjs-dev - 13. By Lionel Le Folgoc
-
* Merge from debian unstable, Ubuntu remaining changes:
- Add OR depends on abrowser. - 11. By Alessio Treglia
-
* Merge from debian unstable, Ubuntu remaining changes:
- Add OR depends on abrowser.
* Add glibc-2.10_fix. patch patch to prevent FTBFS with glibc-2.10.
* debian/config. xml.dist: Allow playing the mkv files that haven't
"video/x-matroska" as mimetype (LP: #417533).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/mediatomb
