-
Committer:
Bazaar Package Importer
-
Author(s):
Benjamin Drung
-
Date:
2010-04-23 12:16:15 UTC
-
mfrom:
(1.1.29 upstream)
-
Revision ID:
james.westby@ubuntu.com-20100423121615-512r13umjb9p4q1s
Tags: 1.0.6-1ubuntu1
* Merge from Debian unstable, remaining changes:
- build and install the libx264 plugin
- add Xb-Npp header to vlc package
- Add patches 519-526 to fix FTBFS with xulruner-1.9.2 from upstream
- Add 600-drop-OJI-xul-192.patch to drop OJI support as xulrunner-1.9.2 on
Linux doesn't support it
- Add apport hook to include more vlc dependencies in bug reports
- Drop --sourcedir=debian/tmp from dh_install to install apport hook
* Drop 527-spanish-desktop.patch (merged upstream).