lp:~vanvugt/ubuntu/oneiric/mediatomb/fix-212441

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/mediatomb at revision 17

Luke Yelavich (community): Approve on 2011-06-03

Evan Broder: Pending requested 2011-05-25

Ubuntu branches: Pending requested 2011-05-25

Diff: 38 lines (+34/-0)

1 file modified

debian/mediatomb-daemon.mediatomb.upstart (+34/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #212441: Mediatomb Init Script not working : upnp error -117

Undecided

Fix Released

Link a bug report

Related blueprints

20. By Daniel van Vugt on 2011-05-25

Remove confusing and unnecessary changelog edits.

19. By Daniel van Vugt on 2011-05-19

Revert to revision 17 (the first attempt) which is the one Evan has
chosen to merge.

18. By Daniel van Vugt on 2011-05-15

* Improved Upstart support (LP: #212441):
  - Removed dependency on /etc/default/mediatomb.
  - Automated config upgrading during package upgrade; from
    /etc/default/mediatomb into /etc/init/mediatomb.conf

17. By Daniel van Vugt on 2011-05-11

Introduce Upstart support (fixes LP: #212441)

16. By Micah Gersten on 2010-08-25

* New upstream release (LP: #553269)
  + Drop patches applied upstream:
    - drop debian/patches/service-id_fix.patch
    - drop debian/patches/ffmpegthumbnailer-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

15. By Iain Lane on 2010-07-11

No change rebuild for libavutil49 → libavutil50 transition

14. By Chris Coulson on 2010-04-14

* debian/rules:
  - Disable spidermonkey support (LP: #536643)
* debian/control:
  - Don't build-depend on libmozjs-dev

13. By Lionel Le Folgoc on 2010-02-22

* Merge from debian unstable, Ubuntu remaining changes:
  - Add OR depends on abrowser.

12. By Reinhard Tartler on 2010-01-19

rebuild for ffmpeg versioned symbols

11. By Alessio Treglia on 2009-08-28

* 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).