-
Committer:
Bazaar Package Importer
-
Author(s):
Reinhard Tartler
-
Date:
2009-04-18 19:52:57 UTC
-
mfrom:
(3.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20090418195257-2n0usd6hx11w63k7
Tags: 0.9.9a-2ubuntu1
* Merge from debian which includes a small security fix.
* Adjusted Vcs fields to point to pkg-multimedia's git branch. The
package is maintained in the 'jaunty' branch.
* Remaining changes to debian:
- build against libxul-dev instead of iceape-dev
- build against libass-dev and libx264-dev
- build against and install libx264 plugin
- add Xb-Npp header to vlc package
- debian/patches/301_DVD_media.diff: Change %U to %f
in VLC .desktop file, cf LP #275043
- Remove arts from dependencies. (LP: #320915)
- debian/control:
- Remove libarts1-dev from build depends
- Don't build package vlc-plugin-arts
- Remove all notions of vlc-plugin-arts from packages descriptions
- debian/rules:
- Remove --enable-arts from confflags
- Delete debian/vlc-plugin-arts.install
- Delete debian/vlc-plugin-arts.links