[SCM] VLC media player packaging branch, maverick, updated. debian/1.0.6-1ubuntu1-90-g0a3a878

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Thu Jun 24 23:27:53 UTC 2010


The following commit has been merged in the maverick branch:
commit 5b41a8ef48b5e934a039371d3bf9403d7d680db7
Merge: e5cac6711903c265d2fcca045ea1028be4b93e8a 276d28a9e15996a05e726abddb87b2be6dd9f255
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Jun 25 00:20:33 2010 +0200

    Merge branch 'sid' into maverick

diff --combined debian/changelog
index 15f5068,0083e08..7177541
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,66 +1,101 @@@
++vlc (1.1.0-1ubuntu1) UNRELEASED; urgency=low
++
++  * 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
++
++ -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 25 Jun 2010 00:19:19 +0200
++
+ vlc (1.1.0-1) unstable; urgency=low
+ 
+   [ Christophe Mutricy ]
+   * New upstream version 1.1.0 (Closes: #586760, LP: #597108)
+     * Fixes many bugs (Closes: #572151, #578917, #526088, #572914, #503377;
+       LP: #206152, #261001, #281478, #282215, #282966, #283379, #283855,
+       #285681, #287263, #328064, #328861, #346631, #356006, #356908, #357595,
+       #358461, #362793, #368599, #375854, #380077, #383443, #403135, #403657,
+       #403802, #414069, #415396, #416294, #419915, #422797, #425975, #427247,
+       #435225, #439271, #442038, #444795, #453928, #459515, #461443, #465687,
+       #466418, #476478, #482440, #491151, #491601, #514915, #517329, #517496,
+       #537627, #539406, #542293, #549029, #549902, #550468, #550485, #550599,
+       #551482, #553503, #554277, #556440, #560167, #564964, #566347, #568750,
+       #570666, #582785, #584009, #586692, #587528)
+     * SONAME changes
+     * Update symbols files
+     * Refresh patches and remove the ones merged upstream
+   * rules:
+     * Disable projectm and sqlite
+     * Upstream Makefile install icons at the good place, simplify debian/rules
+     * Specify where to install solids files
+     * Install the optim only if present
+     * Make sure we have useful build log
+   * *.install: reflect new modules path and add new files
+   * Add a trigger to generate the modules' cache as root.
+   * Update the doc which get installed
+   * control:
+     * Prefer a recent libdvbpsi
+     * add lua5.1 to have luac
+     * Add more build-dep: xcb*, dirac, dc1394 
+   * Patch to allow compilation with xul 1.9.1
+   * Remove unneeded -V for dh_makeshlibs
+   * Use configure option instead of patching
+   * Use dh_bugfiles and update the bug control file
+   * Don't advertise deprecated package in vlc's manpage
+   * Add some news about lua and zvbi
+   * Move the luahttp's .hosts to /etc/vlc
+ 
+   [ Benjamin Drung ]
+   * Switch to dpkg-source 3.0 (quilt) format.
+   * Disable portaudio module.
+   * Update symbols files.
+   * Cleanup clean rule and other parts of debian/rules.
+   * Remove default values from git-buildpackage config.
+   * Change installation of man pages.
+   * Remove unused ${shlibs:Depends}.
+   * Sort Build-Depends and Depends.
+   * Remove unused libhal-dev from Build-Depends (Closes: #580407).
+   * Remove unused --enable-release configure flag.
+   * Remove unused Build-Depends libid3tag0-dev, libsysfs-dev, and libxv-dev.
+   * Provide VBI teletext plugin (Closes: #563873) - thanks to László
+     Benedek <benedekl at gmail.com> for the patch.
+   * Enable atmo, fluidsynth (separate package), libproxy (Closes: #532110),
+     kate (Closes: #563464), and mtp plugin.
+   * Comment disabled features.
+   * Explicitly enable or disable features.
+   * Vcs-Browser link to summary page.
+   * Convert patch header to DEP-3 and add DEP-3 to 502_xulrunner_191.diff.
+   * Add myself to Uploaders.
+   * Drop --sourcedir=debian/tmp from dh_install.
+ 
+  -- Christophe Mutricy <xtophe at videolan.org>  Thu, 24 Jun 2010 22:01:26 +0100
+ 
 +vlc (1.0.6-1ubuntu1.1) lucid-proposed; urgency=low
 +
 +  * debian/vlc{,-nox}.install:
 +    - Move libx264 plugin from vlc to vlc-nox (LP: #575054).
 +  * debian/control:
 +    - Adjust vlc-nox Replaces field properly.
 +
 + -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 04 May 2010 14:17:27 +0200
 +
 +vlc (1.0.6-1ubuntu1) lucid; urgency=low
 +
 +  * 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).
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 23 Apr 2010 12:16:15 +0200
 +
  vlc (1.0.6-1) unstable; urgency=low
  
    * New upstream version 1.0.6
@@@ -32,40 -72,6 +107,40 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Fri, 23 Apr 2010 11:49:18 +0200
  
 +vlc (1.0.5-2ubuntu3) lucid; urgency=low
 +
 +  * debian/patches/527-spanish-desktop.patch: Add Spanish translation,
 +    thanks Ricardo Pérez López (LP: #534312).
 +  * Add apport hook to include more vlc dependencies in bug reports;
 +    thanks to Brian Murray for it (LP: #538719).
 +  * Drop --sourcedir=debian/tmp from dh_install to install apport hook.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Thu, 15 Apr 2010 12:32:03 +0200
 +
 +vlc (1.0.5-2ubuntu2) lucid; urgency=low
 +
 +  * Add patches to fix FTBFS with xulruner-1.9.2 from upstream (LP: #558981)
 +    - add debian/patches/519-Typedef-changes-from-xulrunner-1.9.1.patch
 +    - add debian/patches/520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
 +    - add debian/patches/521-Untracked-API-change-utf8-to-UTF8.patch
 +    - add debian/patches/522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
 +    - add debian/patches/523-Require-xul-1.9.2-explicitly.patch
 +    - add debian/patches/524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
 +    - add debian/patches/525-Mozilla-more-fixes.patch
 +    - add debian/patches/526-Mozilla-More-final-Win32-compile-fixes-for-XulRunner.patch
 +  * Add patch to drop OJI support as xulrunner-1.9.2 on Linux doesn't support it
 +    - add debian/patches/600-drop-OJI-xul-192.patch
 +
 + -- Micah Gersten <micahg at ubuntu.com>  Tue, 13 Apr 2010 10:09:58 -0500
 +
 +vlc (1.0.5-2ubuntu1) lucid; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    - build and install the libx264 plugin
 +    - add Xb-Npp header to vlc package
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 07 Mar 2010 16:26:55 +0100
 +
  vlc (1.0.5-2) unstable; urgency=medium
  
    [ Christophe Mutricy ]
@@@ -81,14 -87,6 +156,14 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Tue, 02 Mar 2010 00:30:56 +0100
  
 +vlc (1.0.5-1ubuntu1) lucid; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    - build and install the libx264 plugin
 +    - add Xb-Npp header to vlc package
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 17 Feb 2010 13:38:29 +0100
 +
  vlc (1.0.5-1) unstable; urgency=low
  
    * New upstream version 1.0.5
@@@ -111,20 -109,6 +186,20 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Sat, 13 Feb 2010 15:52:30 +0000
  
 +vlc (1.0.4-2ubuntu2) lucid; urgency=low
 +
 +  * rebuild for ffmpeg versioned symbols
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 19 Jan 2010 21:40:22 +0100
 +
 +vlc (1.0.4-2ubuntu1) lucid; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    - build and install the libx264 plugin
 +    - add Xb-Npp header to vlc package
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 06 Jan 2010 18:35:23 +0100
 +
  vlc (1.0.4-2) unstable; urgency=low
  
    * Report libavutil50 presence the correct way
@@@ -137,14 -121,6 +212,14 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Tue, 05 Jan 2010 23:31:56 +0100
  
 +vlc (1.0.4-1ubuntu1) lucid; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - build and install the libx264 plugin
 +    - add Xb-Npp header to vlc package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 30 Dec 2009 18:23:36 +0100
 +
  vlc (1.0.4-1) unstable; urgency=low
  
    * New upstream release
@@@ -176,31 -152,6 +251,31 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Wed, 30 Dec 2009 12:56:49 +0100
  
 +vlc (1.0.3-1ubuntu2) lucid; urgency=low
 +
 +  [ Reinhard Tartler ]
 +  * don't crash when cairo-dock is running. LP: #416294
 +    Very ugly patch from upstream to disable ARGB channel usage 
 +    in libqt4
 +  * enable and install the fb module on Linux systems. Closes: #556228
 +
 +  [ Whoopie ]
 +  * enable CDDB in the CDDA module (LP: #439131) and enable
 +    globalhotkeys module (LP: #439077)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Nov 2009 22:11:48 +0100
 +
 +vlc (1.0.3-1ubuntu1) lucid; urgency=low
 +
 +  * Merge from Debian unstable (LP: #435524), remaining changes:
 +    - build against xulrunner-dev instead of iceape-dev
 +    - build against libx264-dev and install libx264 plugin
 +    - add Xb-Npp header to vlc package
 +    - recommend vlc-plugin-pulse for vlc
 +    - backport patch "402_increase_pulseaudio_score.diff"
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 12 Nov 2009 15:29:11 +0100
 +
  vlc (1.0.3-1) unstable; urgency=low
  
    * New upstream release
@@@ -217,22 -168,6 +292,22 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Thu, 05 Nov 2009 12:39:35 +0100
  
 +vlc (1.0.2-1ubuntu2) karmic; urgency=low
 +
 +  * PulseAudio: higher priority than ALSA, LP: #402018
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 19 Oct 2009 21:19:26 +0200
 +
 +vlc (1.0.2-1ubuntu1) karmic; urgency=low
 +
 +  * Merge from Debian unstable (LP: #435524), remaining changes:
 +    - build against xulrunner-dev instead of iceape-dev
 +    - build against libx264-dev and install libx264 plugin
 +    - add Xb-Npp header to vlc package
 +    - recommend vlc-plugin-pulse for vlc
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 25 Sep 2009 14:44:17 +0200
 +
  vlc (1.0.2-1) unstable; urgency=high
  
    * New upstream release
@@@ -248,17 -183,6 +323,17 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Sun, 20 Sep 2009 01:08:41 +0200
  
 +vlc (1.0.1-2ubuntu1) karmic; urgency=low
 +
 +  * Merge from Debian unstable (LP: #426693), remaining changes:
 +    - build against xulrunner-dev instead of iceape-dev
 +    - build against libx264-dev and install libx264 plugin
 +    - add Xb-Npp header to vlc package
 +  * Recommend vlc-plugin-pulse for vlc, so that pulse can be used as default
 +    output.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 09 Sep 2009 10:24:09 +0200
 +
  vlc (1.0.1-2) unstable; urgency=low
  
    * Fix typo in debian/changelog
@@@ -272,22 -196,6 +347,22 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Sun, 06 Sep 2009 19:07:24 +0200
  
 +vlc (1.0.1-1ubuntu2) karmic; urgency=low
 +
 +  * No-change rebuild to pick up new ffmpeg shlibs file.
 +
 + -- Stefan Potyra <sistpoty at ubuntu.com>  Fri, 28 Aug 2009 22:02:06 +0200
 +
 +vlc (1.0.1-1ubuntu1) karmic; urgency=low
 +
 +  * Merge from Debian unstable (LP: #406602, #407570), remaining changes:
 +    - build against xulrunner-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
 +
 + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Sat, 01 Aug 2009 05:54:24 +0300
 +
  vlc (1.0.1-1) unstable; urgency=low
  
    * New upstream bugfix version
@@@ -305,16 -213,6 +380,16 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Wed, 29 Jul 2009 00:21:39 +0200
  
 +vlc (1.0.0-1ubuntu1) karmic; urgency=low
 +
 +  * 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
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 10 Jul 2009 16:18:23 +0200
 +
  vlc (1.0.0-1) unstable; urgency=low
  
    * New Upstream Release
@@@ -335,17 -233,6 +410,17 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Thu, 09 Jul 2009 13:04:20 +0000
  
 +vlc (1.0.0~rc2-1ubuntu1) karmic; urgency=low
 +
 +  * New upstream version.
 +  * tighten build-dependencies on libschroedinger-dev, fixes FTBFS.
 +  * Following bugs have an associated and now closed upstream ticket in
 +    Launchpad: LP: #281295, #73449, #282567, #117640, #172938, #260918,
 +    #273685, #275043, #277834, #282394, #290753, #294136, #298925, #304265,
 +    #309728, #311742, #314038
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 05 Jun 2009 12:28:15 +0200
 +
  vlc (1.0.0~rc2-1) experimental; urgency=low
  
    * New Upstream Release Candidate
@@@ -392,36 -279,6 +467,36 @@@ vlc (0.9.9a-3) unstable; urgency=mediu
  
   -- Christophe Mutricy <xtophe at videolan.org>  Sat, 06 Jun 2009 16:56:16 +0200
  
 +vlc (0.9.9a-2ubuntu2) karmic; urgency=low
 +
 +  * Rebuild for libass1 -> libass3 transistion.
 +
 + -- Steve Kowalik <stevenk at ubuntu.com>  Mon, 25 May 2009 23:29:31 +1000
 +
 +vlc (0.9.9a-2ubuntu1) jaunty; urgency=low
 +
 +  * 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
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 18 Apr 2009 19:52:57 +0200
 +
  vlc (0.9.9a-2) unstable; urgency=medium
  
    * Security fix
@@@ -431,29 -288,6 +506,29 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Tue, 07 Apr 2009 23:06:48 +0200
  
 +vlc (0.9.9a-1ubuntu1) jaunty; urgency=low
 +
 +  * Merge from Debian. (LP: #356310)
 +  * Remaining changes:
 +    - build against libxul-dev instead of iceape-dev
 +    - build against libass-dev and libx264-dev
 +    - build against and install libx264 plugin
 +    - adjust Vcs-Bzr Headers in debian/control
 +    - 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
 +
 + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Mon, 06 Apr 2009 13:58:06 +0200
 +
  vlc (0.9.9a-1) unstable; urgency=low
  
    * New upstream version 0.9.9a
@@@ -505,50 -339,6 +580,50 @@@ vlc (0.9.8a-2) unstable; urgency=lo
  
   -- Christophe Mutricy <xtophe at videolan.org>  Tue, 24 Feb 2009 16:00:31 +0100
  
 +vlc (0.9.8a-1ubuntu4) jaunty; urgency=low
 +
 +  [ Cody Russell ]
 +  * Check whether the server allows actions before trying to send them.
 +    (LP: #328605)
 +
 + -- James Westby <james.westby at ubuntu.com>  Wed, 25 Feb 2009 11:37:57 +0000
 +
 +vlc (0.9.8a-1ubuntu3) jaunty; urgency=low
 +
 +  [ Andreas Wenning ]
 +  * 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
 +
 + -- Mario Limonciello <mario_limonciello at dell.com>  Thu, 12 Feb 2009 14:58:45 -0600
 +
 +vlc (0.9.8a-1ubuntu2) jaunty; urgency=low
 +
 +  * no change rebuild to pick up new libx264, LP: #325720
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 07 Feb 2009 20:40:56 +0100
 +
 +vlc (0.9.8a-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian. LP: #300328, #305100, #289263
 +  * Fixes CVE-2008-5276
 +  * remaining changes
 +    - build against libxul-dev instead of iceape-dev
 +    - build against libdca-dev, libass-dev and libx264-dev
 +    - build against and install libx264 plugin
 +    - adjust Vcs-Bzr Headers in debian/control
 +    - add Xb-Npp header to vlc package
 +    - debian/patches/301_DVD_media.diff: Change %U to %f
 +       in VLC .desktop file, cf LP #275043
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 07 Dec 2008 23:12:27 +0100
 +
  vlc (0.9.8a-1) experimental; urgency=low
  
    * New upstream release
@@@ -559,20 -349,6 +634,20 @@@
  
   -- Christophe Mutricy <xtophe at videolan.org>  Wed, 03 Dec 2008 20:20:52 +0100
  
 +vlc (0.9.6-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian/experimental, fixes LP: #289263
 +    remaining changes:
 +    - build against libxul-dev instead of iceape-dev
 +    - build against libdca-dev, libass-dev and libx264-dev
 +    - build against and install libx264 plugin
 +    - adjust Vcs-Bzr Headers in debian/control
 +    - add Xb-Npp header to vlc package
 +    - debian/patches/301_DVD_media.diff: Change %U to %f
 +       in VLC .desktop file, cf LP #275043
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 15:45:06 +0100
 +
  vlc (0.9.6-1) experimental; urgency=low
  
    [ Reinhard Tartler ]
@@@ -602,38 -378,6 +677,38 @@@ vlc (0.9.4-2) experimental; urgency=lo
  
   -- Christophe Mutricy <xtophe at videolan.org>  Mon, 20 Oct 2008 23:23:46 +0200
  
 +vlc (0.9.4-1ubuntu3) intrepid; urgency=low
 +
 +  * link vlc to unicode enabled curses library. Thanks to Rafaël Carré for
 +    reporting.(LP: #282644)
 +  * enable emedded video (LP: #282582)
 +  * Autodetect screen while using Xinerama to toggle fullscreen (LP: #115419)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 13 Oct 2008 21:47:13 +0200
 +
 +vlc (0.9.4-1ubuntu2) intrepid; urgency=low
 +
 +  * add new plugin database meta fields Xb-Npp-Description and Xb-Npp-File
 +    - update debian/control
 +  * link plugin binary to /usr/lib/xulrunner-addons/plugins/
 +    - update debian/mozilla-plugin-vlc.links
 +
 + -- Alexander Sack <asac at ubuntu.com>  Mon, 13 Oct 2008 17:45:51 +0200
 +
 +vlc (0.9.4-1ubuntu1) intrepid; urgency=low
 +
 +  * merge from debian/experimental
 +  * New upstream release fixes LP: #280081, #280378
 +  * remaining changes:
 +    - build against libxul-dev instead of iceape-dev
 +    - build against libdca-dev, libass-dev and libx264-dev
 +    - adjust Vcs-Bzr Headers in debian/control
 +    - add Xb-Npp header to vlc package
 +    - debian/patches/301_DVD_media.diff: Change %U to %f
 +       in VLC .desktop file, cf LP #275043
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 12 Oct 2008 11:37:03 +0200
 +
  vlc (0.9.4-1) experimental; urgency=low
  
    * New upstream bugfix version
@@@ -658,70 -402,6 +733,70 @@@ vlc (0.9.3-1) experimental; urgency=lo
  
   -- Christophe Mutricy <xtophe at videolan.org>  Fri, 26 Sep 2008 23:49:48 +0200
  
 +vlc (0.9.3-0ubuntu1) intrepid; urgency=low
 +
 +  [ Reinhard Tartler ]
 +  * new upstream bugfix only Releases LP: #274721
 +
 +  Relevant fixes from NEWS file:
 +  
 +    Various bugfixes:
 +   * Fixed DTS channel order on 5.1 systems
 +   * Fixed pausing behavior for subtitles and for Audio-CD
 +   * Multiple subtitles and podcast fixes
 +   * Various crashes fixed in PS, SSA, mkv, xspf, freetype
 +   * Fixed update system bugs
 +   * Other bug fixes (dvd language selection, subtitle colours, HTTP keep-alive...)
 +  
 +  Qt4 interface:
 +   * Added Faster/Slower icons to the controller panel
 +   * Fixed lost playlist columns when switching the playlist view
 +   * Added needed options to Simple preferences (to avoid NVIDIA drivers issues)
 +   * Fullscreen controller: added time label, remembering of last position
 +   * Fixed drag'n drop behaviour on the playlist
 +   * Multiple other fixes (Enter hotkey in preferences, Skins selection...)
 +
 +  [ Saïvann Carignan ]
 +  * debian/patches/301_DVD_media.diff: Change %U to %f
 +    in VLC .desktop file . (LP: #275043) 
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 27 Sep 2008 09:30:04 +0200
 +
 +vlc (0.9.2-1ubuntu2) intrepid; urgency=low
 +
 +  * remove spurious conflicts on libvlc2. LP: #274614
 +  * fix FTBFS on all archs other than i386/lpia and amd64. Patch from
 +    pkg-multimedia svn, Closes: #499860
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 26 Sep 2008 08:35:29 +0200
 +
 +vlc (0.9.2-1ubuntu1) intrepid; urgency=low
 +
 +  * New Upstream Release, exception granted by
 +      - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404
 +  
 +  Changes done in ubuntu:
 +  
 +  * add libxul-dev to build-depends
 +  * make sure that vlc is build against libxul in configure. This doesn't
 +    change anything in the package, but makes it more robust if building
 +    in an 'unclean' chroot or when modifying the package.
 +  * debian/control: make Vcs-* fields point to the motumedia branch
 +  * add libx264-dev and libass-dev to build-depends
 +    LP: #210354, #199870
 +  * actually enable libass support by passing --enable-libass to configure
 +  * enable libdca: add libdca-dev to build depends and --enable-libdca
 +  * install the x264 plugin.
 +
 +  Changes already in the pkg-multimedia branch in debian:
 +  
 +  * don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install  
 +  * new upstream .desktop file now registers flash video mimetype LP: #261567
 +  * add Xb-Npp-Applications to mozilla-plugin-vlc
 +  * remove duplicate entries in debian/vlc-nox.install
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 17 Sep 2008 21:56:14 +0200
 +
  vlc (0.9.2-1) experimental; urgency=low
  
    [ Christophe Mutricy ]
diff --combined debian/control
index 93edc68,15fc1ce..bc4704e
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,16 +1,17 @@@
  Source: vlc
  Section: video
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
             Clément Stenac <zorglub at debian.org>,
             Loic Minier <lool at dooz.org>,
             Christophe Mutricy <xtophe at videolan.org>,
-            Mohammed Adnène Trojette <adn+deb at diwi.org>
- Build-Depends: debhelper (>= 7),
+            Mohammed Adnène Trojette <adn+deb at diwi.org>,
+            Benjamin Drung <bdrung at ubuntu.com>
+ Build-Depends: debhelper (>= 7.2.3~),
                 dh-buildinfo,
                 gettext,
-                quilt,
-                nasm,
-                yasm [amd64 kfreebsd-amd64],
                 liba52-0.7.4-dev,
                 libaa1-dev,
                 libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@@ -25,21 -22,23 +23,23 @@@
                 libcaca-dev (>= 0.99.beta4),
                 libcddb2-dev,
                 libcdio-dev,
+                libdc1394-22-dev,
                 libdca-dev,
-                libdvbpsi5-dev | libdvbpsi-dev,
+                libdirac-dev,
+                libdvbpsi-dev | libdvbpsi5-dev,
                 libdvdnav-dev,
                 libdvdread-dev (>= 0.9.5),
                 libfaad-dev,
                 libflac-dev (>= 1.1.2-3),
+                libfluidsynth-dev,
                 libfreetype6-dev,
                 libfribidi-dev,
                 libggi2-dev,
                 libgl1-mesa-dev,
                 libglib2.0-0,
                 libgnutls-dev (>= 1.2.8),
-                libhal-dev (>= 0.5.5.1-3) [!hurd-i386],
-                libid3tag0-dev,
                 libjack-dev,
+                libkate-dev,
                 liblircclient-dev,
                 liblivemedia-dev (>= 2009.11.27),
                 liblua5.1-0-dev,
@@@ -48,11 -47,13 +48,13 @@@
                 libmodplug-dev,
                 libmpcdec-dev,
                 libmpeg2-4-dev,
+                libmtp-dev,
                 libncursesw5-dev,
                 libnotify-dev,
                 libogg-dev,
                 libpng12-dev,
                 libpostproc-dev (>= 0.cvs20060823),
+                libproxy-dev,
                 libpulse-dev,
                 libqt4-dev,
                 libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@@ -65,7 -66,6 +67,6 @@@
                 libspeex-dev,
                 libsvga1-dev [amd64 i386],
                 libswscale-dev,
-                libsysfs-dev,
                 libtag1-dev,
                 libtar-dev,
                 libtheora-dev,
@@@ -76,106 -76,33 +77,34 @@@
                 libvcdinfo-dev,
                 libvorbis-dev,
                 libx11-dev,
+                libx11-xcb-dev,
 +               libx264-dev,
+                libxcb1-dev,
                 libxcb-keysyms1-dev,
+                libxcb-randr0-dev,
+                libxcb-shm0-dev,
+                libxcb-xv0-dev,
                 libxext-dev,
                 libxml2-dev,
                 libxpm-dev,
                 libxt-dev,
-                libxv-dev,
+                libzvbi-dev,
+                lua5.1,
+                nasm,
                 pkg-config,
                 xulrunner-dev,
+                yasm [amd64 kfreebsd-amd64],
                 zlib1g-dev
  Standards-Version: 3.8.4
  Homepage: http://www.videolan.org/vlc/
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/vlc.git
- Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=shortlog;h=refs/heads/lucid
- 
- Package: vlc
- Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
-          ${shlibs:Depends},
-          ${misc:Depends},
-          ttf-dejavu-core
- Recommends: vlc-plugin-pulse (= ${binary:Version})
- Suggests: mozilla-plugin-vlc,
-           videolan-doc
- Replaces: vlc-nox (<< 1.0.4-2)
- Provides: mp3-decoder
- Description: multimedia player and streamer
-  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
-  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
-  streams from various network sources.
-  .
-  VLC can also be used as a streaming server that duplicates the stream it
-  reads and multicasts them through the network to other clients, or serves
-  them through HTTP.
-  .
-  VLC has support for on-the-fly transcoding of audio and video formats, either
-  for broadcasting purposes or for movie format transformations. Support for
-  most output methods is provided by this package, but features can be added
-  by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl)
-  or video plugins (vlc-plugin-sdl, vlc-plugin-ggi, vlc-plugin-svgalib). There
-  is also a web browser plugin in the mozilla-plugin-vlc package.
- 
- Package: vlc-dbg
- Section: debug
- Priority: extra
- Architecture: any
- Depends: ${shlibs:Depends},
-          ${misc:Depends},
-          vlc-nox (= ${binary:Version})
- Description: debugging symbols for vlc
-  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
-  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
-  streams from various network sources.
-  .
-  This package contains the debugging symbols for vlc.
+ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=summary
  
- Package: vlc-nox
- Architecture: any
- Depends: ${shlibs:Depends},
-          ${misc:Depends}
- Replaces: vlc (<= 1.0.6-1ubuntu1)
- Provides: mp3-decoder
- Description: multimedia player and streamer (without X support)
-  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
-  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
-  streams from various network sources.
-  .
-  VLC can also be used as a streaming server that duplicates the stream it
-  reads and multicasts them through the network to other clients, or serves
-  them through HTTP.
-  .
-  VLC has support for on-the-fly transcoding of audio and video formats, either
-  for broadcasting purposes or for movie format transformations. Support for
-  most output methods is provided by this package, but features can be added
-  by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl,
-  vlc-plugin-jack) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
-  vlc-plugin-svgalib). There is also a web browser plugin in  the
-  mozilla-plugin-vlc package.
-  .
-  This package contains a version of VLC that does not require X and that is
-  thus suitable for headless servers.
- 
- Package: libvlccore2
- Section: libs
- Architecture: any
- Depends: vlc-data (= ${source:Version}),
-          ${shlibs:Depends},
-          ${misc:Depends}
- Description: base library for VLC and its modules
-  This package contains the shared library required by VLC modules and libvlc.
-  .
-  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
-  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
-  streams from various network sources.
- 
- Package: libvlc2
+ Package: libvlc5
  Section: libs
  Architecture: any
- Depends: ${shlibs:Depends},
-          ${misc:Depends}
+ Depends: ${misc:Depends},
+          ${shlibs:Depends}
  Replaces: vlc (<< 0.8.6.c-6)
  Description: multimedia player and streamer library
   This package contains the shared library required by applications using VLC
@@@ -185,53 -112,44 +114,44 @@@
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
  Package: libvlc-dev
  Section: libdevel
  Architecture: any
- Depends: libvlc2 (= ${binary:Version}), libvlccore-dev, pkg-config,
-          ${shlibs:Depends}, ${misc:Depends}
+ Depends: libvlc5 (= ${binary:Version}),
+          libvlccore-dev,
+          pkg-config,
+          ${misc:Depends}
  Replaces: libvlc0-dev
  Description: development files for libvlc
-  This package contains headers and a static library required to build 
+  This package contains headers and a static library required to build
   standalone applications that use VLC features.
   .
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
- Package: vlc-plugin-sdl
+ Package: libvlccore4
+ Section: libs
  Architecture: any
- Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
- Description: SDL video and audio output plugin for VLC
-  This plugin adds support for the Simple DirectMedia Layer library to
-  the VLC media player. To activate it, use the `--vout sdl' or
-  `--aout sdl' flags or select the `sdl' video or audio output plugin
-  from the preferences menu.
+ Depends: vlc-data (= ${source:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: base library for VLC and its modules
+  This package contains the shared library required by VLC modules and libvlc.
   .
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
- Package: vlc-plugin-ggi
+ Package: libvlccore-dev
+ Section: libdevel
  Architecture: any
- Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
- Description: GGI video output plugin for VLC
-  This is a GGI plugin for the VLC media player.  To activate it, use
-  the `--vout ggi' flag or select the `ggi' video output plugin from the
-  preferences menu.
+ Depends: libvlccore4 (= ${binary:Version}),
+          pkg-config,
+          ${misc:Depends}
+ Description: development files for libvlccore
+  This package contains headers and a static library required to build plugins
+  for VLC.
   .
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
@@@ -239,38 -157,10 +159,41 @@@
  
  Package: mozilla-plugin-vlc
  Architecture: any
- Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
+ Depends: vlc,
+          vlc-nox (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
 +Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384,
 +                     92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
 +Xb-Npp-Name: VLC Multimedia Plugin
 +Xb-Npp-Description: play video and audio in firefox using the VLC Multimedai Player
 +Xb-Npp-File: libvlcplugin.so
 +Xb-Npp-MimeType: audio/mpeg,
 +                 audio/x-mpeg,
 +                 video/mpeg,
 +                 video/x-mpeg,
 +                 video/mpeg-system,
 +                 video/x-mpeg-system,
 +                 video/mpeg4,
 +                 audio/mpeg4,
 +                 application/mpeg4-iod,
 +                 application/mpeg4-muxcodetable,
 +                 video/x-msvideo,
 +                 video/quicktime,
 +                 application/x-ogg,
 +                 application/ogg,
 +                 application/x-vlc-plugin,
 +                 video/x-ms-asf-plugin,
 +                 video/x-ms-asf,
 +                 application/x-mplayer2,
 +                 video/x-ms-wmv,
 +                 application/x-google-vlc-plugin,
 +                 audio/wav,
 +                 audio/x-wav,
 +                 audio/3gpp,
 +                 video/3gpp,
 +                 audio/3gpp2,
 +                 video/3gpp2
  Description: multimedia plugin for web browsers based on VLC
   This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
   more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
@@@ -282,24 -172,117 +205,117 @@@
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
- Package: vlc-plugin-svgalib
- Architecture: amd64 i386
- Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
- Description: SVGAlib video output plugin for VLC
-  This plugin adds support for SVGAlib to the VLC media player. To
-  activate it, use the `--vout svgalib' flag or select the `svgalib' video
-  output plugin from the preferences menu. Note that you will need root
-  permissions to use SVGAlib.
+ Package: vlc
+ Architecture: any
+ Depends: ttf-dejavu-core,
+          vlc-nox (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Recommends: vlc-plugin-pulse (= ${binary:Version})
+ Suggests: mozilla-plugin-vlc,
+           videolan-doc
+ Replaces: vlc-nox (<< 1.0.4-2)
+ Provides: mp3-decoder
+ Description: multimedia player and streamer
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+  .
+  VLC can also be used as a streaming server that duplicates the stream it
+  reads and multicasts them through the network to other clients, or serves
+  them through HTTP.
+  .
+  VLC has support for on-the-fly transcoding of audio and video formats, either
+  for broadcasting purposes or for movie format transformations. Support for
+  most output methods is provided by this package, but features can be added
+  by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl)
+  or video plugins (vlc-plugin-sdl, vlc-plugin-ggi, vlc-plugin-svgalib). There
+  is also a web browser plugin in the mozilla-plugin-vlc package.
+ 
+ Package: vlc-data
+ Depends: ${misc:Depends}
+ Architecture: all
+ Replaces: mozilla-plugin-vlc (<< 0.9.2-1),
+           vlc (<< 0.9.2-1),
+           vlc-nox (<< 0.9.2-1)
+ Description: Common data for VLC
+  Localisations, HTTP interface files, Lua scripts for VLC media player
   .
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
- Package: vlc-plugin-jack
+ Package: vlc-dbg
+ Section: debug
+ Priority: extra
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}),
-          ${shlibs:Depends},
           ${misc:Depends}
+ Description: debugging symbols for vlc
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+  .
+  This package contains the debugging symbols for vlc.
+ 
+ Package: vlc-nox
+ Architecture: any
+ Depends: ${misc:Depends},
+          ${shlibs:Depends}
 -Replaces: vlc (<< 1.0.4-2)
++Replaces: vlc (<= 1.0.6-1ubuntu1)
+ Provides: mp3-decoder
+ Description: multimedia player and streamer (without X support)
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+  .
+  VLC can also be used as a streaming server that duplicates the stream it
+  reads and multicasts them through the network to other clients, or serves
+  them through HTTP.
+  .
+  VLC has support for on-the-fly transcoding of audio and video formats, either
+  for broadcasting purposes or for movie format transformations. Support for
+  most output methods is provided by this package, but features can be added
+  by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl,
+  vlc-plugin-jack) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
+  vlc-plugin-svgalib). There is also a web browser plugin in  the
+  mozilla-plugin-vlc package.
+  .
+  This package contains a version of VLC that does not require X and that is
+  thus suitable for headless servers.
+ 
+ Package: vlc-plugin-fluidsynth
+ Architecture: any
+ Depends: vlc-nox (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: FluidSynth plugin for VLC
+  This plugin adds support for playing MIDI file via the FluidSynth software
+  synthesizer to the VLC media player.
+  .
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+ 
+ Package: vlc-plugin-ggi
+ Architecture: any
+ Depends: vlc-nox,
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: GGI video output plugin for VLC
+  This is a GGI plugin for the VLC media player.  To activate it, use
+  the `--vout ggi' flag or select the `ggi' video output plugin from the
+  preferences menu.
+  .
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+ 
+ Package: vlc-plugin-jack
+ Architecture: any
+ Depends: vlc-nox (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
  Description: Jack audio plugins for VLC
   These plugins add support for JACK to the VLC media player. To
   activate the audio output module, use the `--aout jack' flag or
@@@ -313,8 -296,8 +329,8 @@@
  Package: vlc-plugin-pulse
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}),
-          ${shlibs:Depends},
-          ${misc:Depends}
+          ${misc:Depends},
+          ${shlibs:Depends}
  Description: PulseAudio plugin for VLC
   This plugin adds support for PulseAudio to the VLC media player. To
   activate the audio output module, use the `--aout pulse' flag or
@@@ -324,11 -307,26 +340,26 @@@
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
+ Package: vlc-plugin-sdl
+ Architecture: any
+ Depends: vlc-nox,
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: SDL video and audio output plugin for VLC
+  This plugin adds support for the Simple DirectMedia Layer library to
+  the VLC media player. To activate it, use the `--vout sdl' or
+  `--aout sdl' flags or select the `sdl' video or audio output plugin
+  from the preferences menu.
+  .
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+ 
  Package: vlc-plugin-svg
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}),
-          ${shlibs:Depends},
-          ${misc:Depends}
+          ${misc:Depends},
+          ${shlibs:Depends}
  Description: SVG plugin for VLC
   This plugin allows you to render SVG graphics on top of the video. It is a text
   renderer, and must be activated through the '--text-renderer svg' option. When
@@@ -339,12 -337,28 +370,28 @@@
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
   streams from various network sources.
  
- Package: vlc-data
- Depends: ${misc:Depends}
- Architecture: all
- Replaces: vlc (<< 0.9.2-1), vlc-nox (<< 0.9.2-1), mozilla-plugin-vlc (<< 0.9.2-1)
- Description: Common data for VLC
-  Localisations, HTTP interface files, Lua scripts for VLC media player 
+ Package: vlc-plugin-svgalib
+ Architecture: amd64 i386
+ Depends: vlc-nox (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: SVGAlib video output plugin for VLC
+  This plugin adds support for SVGAlib to the VLC media player. To
+  activate it, use the `--vout svgalib' flag or select the `svgalib' video
+  output plugin from the preferences menu. Note that you will need root
+  permissions to use SVGAlib.
+  .
+  VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+  streams from various network sources.
+ 
+ Package: vlc-plugin-zvbi
+ Architecture: any
+ Depends: vlc-nox (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: VBI teletext plugin for VLC
+  This plugin adds support for VBI teletext to the VLC media player.
   .
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
   DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
diff --combined debian/gbp.conf
index e5a96d5,be48ba4..66e9e98
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,10 -1,4 +1,4 @@@
  [DEFAULT]
- # the default branch for upstream sources
- upstream-branch=upstream
- # the default branch for the debian patch
- debian-branch=lucid
- #versioning conventions (defaults)
- upstream-tag = upstream/%(version)s
- debian-tag = debian/%(version)s
- # use pristine tar
 -debian-branch = sid
++debian-branch = maverick
  pristine-tar = True
+ compression = bzip2
diff --combined debian/patches/series
index 04ed3d7,b6bad6f..c1d1f21
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,17 -1,6 +1,14 @@@
  052_as-needed.diff
  102_dejavu_font.diff
  104_notify.diff
  200_osdmenu_paths.diff
- 300_manpage_syntax.diff
- 401_i420_mmx_pic.diff
  501_decrease_alsa_buffer.diff
- 502_fix_typo.patch
+ 502_xulrunner_191.diff
 +519-Typedef-changes-from-xulrunner-1.9.1.patch
 +520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
 +521-Untracked-API-change-utf8-to-UTF8.patch
 +522-Mozilla-do-not-hard-code-autoconf-file-descriptors.patch
 +523-Require-xul-1.9.2-explicitly.patch
 +524-Mozilla-More-fixes-for-XulRunner-1.9.2.patch
 +525-Mozilla-more-fixes.patch
 +600-drop-OJI-xul-192.patch
diff --combined debian/rules
index 9af3524,2d81631..ef6e8ee
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,5 +1,5 @@@
  #!/usr/bin/make -f
  
- #DH_VERBOSE=1
- 
  DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
  DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@@ -29,10 -27,6 +27,6 @@@ MAKEFLAGS += -j$(NUMJOBS
  endif
  endif
  
- 
- 
- include /usr/share/quilt/quilt.make
- 
  LDFLAGS = -Wl,--as-needed
  
  # configure flags
@@@ -40,37 -34,38 +34,38 @@@ confflags += 
  	--config-cache \
  	--disable-maintainer-mode \
  	--disable-update-check \
+ 	--disable-silent-rules \
  	--enable-fast-install \
- 	--enable-release \
  	--prefix=/usr \
+ 	--sysconfdir=/etc \
  	--with-binary-version=$(DEBIAN_VERSION) \
  	$(NULL)
  # configure features
  confflags += \
- 	--disable-atmo \
- 	--disable-fluidsynth \
- 	--disable-gnomevfs \
- 	--disable-kate \
- 	--disable-mtp \
- 	--enable-x264 \
- 	--disable-zvbi \
  	--enable-a52 \
  	--enable-aa \
+ 	--enable-atmo \
  	--enable-bonjour \
  	--enable-caca \
+ 	--enable-dc1394 \
  	--enable-dca \
+ 	--enable-dirac \
  	--enable-dvb \
  	--enable-dvbpsi \
  	--enable-dvdnav \
  	--enable-faad \
  	--enable-flac \
+ 	--enable-fluidsynth \
  	--enable-freetype \
  	--enable-fribidi \
  	--enable-ggi \
  	--enable-gnutls \
  	--enable-jack \
+ 	--enable-kate \
  	--enable-libass \
  	--enable-libmpeg2 \
+ 	--enable-libproxy \
+ 	--enable-libxml2 \
  	--enable-lirc \
  	--enable-live555 \
  	--enable-mad \
@@@ -78,12 -73,15 +73,15 @@@
  	--enable-mod \
  	--enable-mozilla \
  	--enable-mpc \
+ 	--enable-mtp \
+ 	--enable-mux_ogg \
  	--enable-ncurses \
  	--enable-notify \
  	--enable-ogg \
  	--enable-pulse \
  	--enable-qt4 \
  	--enable-realrtsp \
+ 	--enable-schroedinger \
  	--enable-sdl \
  	--enable-shout \
  	--enable-skins2 \
@@@ -91,15 -89,40 +89,39 @@@
  	--enable-speex \
  	--enable-svg \
  	--enable-taglib \
- 	--enable-telx \
  	--enable-theora \
  	--enable-twolame \
+ 	--enable-udev \
+ 	--enable-upnp \
  	--enable-vcd \
  	--enable-vcdx \
  	--enable-vorbis \
++	--enable-x264 \
+ 	--enable-zvbi \
+ 	--with-kde-solid=/usr/share/kde4/apps/ \
  	--with-mozilla-pkg=libxul \
  	$(NULL)
- 
+ # Reasons for disabling features:
+ # dxva2 -> Windows only
+ # gnomevfs -> poorly maintained
+ # goom -> not in Debian
+ # libva -> needs a vaapi enabled avcodec
+ # osso_screensaver -> not targetting maemo
+ # portaudio -> not needed
+ # projectm -> broken
+ # sqlite -> still in development
+ # telx -> incompatible with zvbi
 -# x264 -> not in Debian
+ confflags += \
+ 	--disable-dxva2 \
+ 	--disable-gnomevfs \
+ 	--disable-goom \
+ 	--disable-libva \
+ 	--disable-osso_screensaver \
+ 	--disable-portaudio \
+ 	--disable-projectm \
+ 	--disable-sqlite \
+ 	--disable-telx \
 -	--disable-x264 \
+ 	$(NULL)
  
  # Linux specific flags
  ifeq ($(DEB_HOST_ARCH_OS),linux)
@@@ -117,11 -140,8 +139,8 @@@ ifneq ($(filter $(DEB_HOST_ARCH), amd6
  confflags += --enable-svgalib
  endif
  
- # A few shortcuts
- VIDDIR := usr/share/vlc
- 
  build: build-stamp
- build-stamp: $(QUILT_STAMPFN)
+ build-stamp:
  	dh_testdir
  	# We need to build the static library apart
  	# Else it's a mess when we build the modules
@@@ -151,66 -171,52 +170,52 @@@ clean
  	dh_testdir
  	dh_testroot
  	rm -f build-stamp
+ 	[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak \
+         debian/vlc-nox.install
  	rm -f debian/vlc-nox.install.kfreebsd
  	rm -f debian/vlc-nox.install.hurd
  	# Clean VLC
  	[ ! -f Makefile ] || $(MAKE) distclean
  	rm -rf tmp/
- 	# Clean zsh completion stuff
- 	rm -f extras/zsh
- 	# Removed ugly cruft
- 	rm -f src/misc/modules_builtin.h
- 	rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h
- 	# Remove spurious autotools stuff
- 	rm -f config.log confdefs.h
- 	# Unpatch package
- 	$(MAKE) -f debian/rules unpatch
  	dh_clean
  
  install: build
  	dh_testdir
  	dh_testroot
  	dh_prep
+ 	dh_installdirs
+ # Add the optimization dirs only if present
+ 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
+ 	cp debian/vlc-nox.install debian/vlc-nox.install.bak
+ 	for dir in sse2 3dnow altivec arm_neon mmx mmxext ; do \
+ 	        if test -d debian/tmp/usr/lib/vlc/plugins/$${dir}; then \
+ 	                echo usr/lib/vlc/plugins/$${dir} >> debian/vlc-nox.install ; \
+ 	        fi ; \
+ 	done
+ # Remove some modules on non-linux arch
  	sed -e '/\(lib\|libaccess_\)\(alsa\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
  	 debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
  	sed -e '/\(lib\|libaccess_\)\(probe_hal\)_/d' \
  	 debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd
- 	dh_installdirs
- 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
  	cp tmp/libvlc.a debian/tmp/usr/lib
  	cp tmp/libvlccore.a debian/tmp/usr/lib
  	# Clean up libtool crap
  	find debian/tmp -name '*.la' -exec rm '{}' ';'
  	# Remove useless stuff
- 	rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
- 	rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
- 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
- 	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
- 	rm -rf debian/tmp/usr/share/man/man1
- 	# Move icons around
- 	mkdir -p debian/tmp/usr/share/icons/hicolor/16x16/apps
- 	mv debian/tmp/$(VIDDIR)/vlc16x16.png debian/tmp/usr/share/icons/hicolor/16x16/apps/vlc.png
- 	mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
- 	mv debian/tmp/$(VIDDIR)/vlc32x32.png debian/tmp/usr/share/icons/hicolor/32x32/apps/vlc.png
- 	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
- 	mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc.png
- 	mv debian/tmp/$(VIDDIR)/vlc48x48-christmas.png debian/tmp/usr/share/icons/hicolor/48x48/apps/vlc-christmas.png
- 	mkdir -p debian/tmp/usr/share/icons/hicolor/128x128/apps
- 	mv debian/tmp/$(VIDDIR)/vlc128x128.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc.png
- 	mv debian/tmp/$(VIDDIR)/vlc128x128-christmas.png debian/tmp/usr/share/icons/hicolor/128x128/apps/vlc-christmas.png
- 	mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
+ 	ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
+ 	ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+ 	rm -f debian/tmp/usr/share/man/man1/vlc-config.1
  	# Install stuff
  	dh_install -si --fail-missing
  	# move .hosts
  	mkdir -p debian/vlc-data/etc/vlc/http
  	mv debian/vlc-data/usr/share/vlc/http/.hosts debian/vlc-data/etc/vlc/http
  	ln -s /etc/vlc/http/.hosts debian/vlc-data/usr/share/vlc/http/.hosts
+ 	mkdir -p debian/vlc-data/etc/vlc/lua/http
+ 	mv debian/vlc-data/usr/share/vlc/lua/http/.hosts debian/vlc-data/etc/vlc/lua/http
+ 	ln -s /etc/vlc/http/.hosts debian/vlc-data/usr/share/vlc/lua/http/.hosts
+ 	
  
- 	#install BTS stuff
- 	for pkg in vlc-nox vlc-data; do \
- 	    mkdir -p  debian/$${pkg}/usr/share/bug/$${pkg}; \
- 	    cp debian/bug/* debian/$${pkg}/usr/share/bug/$${pkg}; \
- 	done
  ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
  	# Check that we did not install a plugin linked with libX11 in vlc-nox
  	BORKED=no; \
@@@ -247,18 -253,18 +252,18 @@@ binary-arch: build instal
  	dh_buildinfo -p vlc-nox
  	dh_installmenu -s
  	dh_installmime -s
- 	dh_installman doc/vlc.1 -p vlc-nox
- 	dh_installman doc/vlc-wrapper.1 -p vlc-nox
+ 	dh_installman -s
  	dh_installchangelogs ChangeLog -p vlc
  	dh_installchangelogs ChangeLog -p vlc-nox
  	dh_lintian 
+ 	dh_bugfiles
  	dh_strip -s --dbg-package=vlc-dbg
  	dh_compress -s
  	dh_fixperms -s
- 	dh_makeshlibs -plibvlc2 -V # -V is nasty, but I mean it
- 	dh_makeshlibs -plibvlccore2 -V # -V is nasty, but I mean it
+ 	dh_makeshlibs -plibvlc5
+ 	dh_makeshlibs -plibvlccore4
  	dh_installdeb -s
- 	dh_shlibdeps -s -ldebian/libvlc2/usr/lib:debian/libvlccore2/usr/lib
+ 	dh_shlibdeps -s -ldebian/libvlc5/usr/lib:debian/libvlccore4/usr/lib
  	dh_gencontrol -s
  	dh_md5sums -s
  	dh_builddeb -s
diff --combined debian/vlc-nox.install
index 6ab031a,3a3b9a6..407c605
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@@ -3,152 -3,161 +3,162 @@@ usr/bin/nvl
  usr/bin/rvlc
  usr/bin/vlc
  usr/bin/vlc-wrapper
- usr/lib/vlc/access/libaccess_alsa_plugin.so
- usr/lib/vlc/access/libaccess_bd_plugin.so
- usr/lib/vlc/access/libaccess_directory_plugin.so
- usr/lib/vlc/access/libaccess_dv_plugin.so
- usr/lib/vlc/access/libaccess_fake_plugin.so
- usr/lib/vlc/access/libaccess_file_plugin.so
- usr/lib/vlc/access/libaccess_ftp_plugin.so
- usr/lib/vlc/access/libaccess_http_plugin.so
- usr/lib/vlc/access/libaccess_mmap_plugin.so
- usr/lib/vlc/access/libaccess_mms_plugin.so
- usr/lib/vlc/access/libaccess_oss_plugin.so
- usr/lib/vlc/access/libaccess_realrtsp_plugin.so
- usr/lib/vlc/access/libaccess_smb_plugin.so
- usr/lib/vlc/access/libaccess_tcp_plugin.so
- usr/lib/vlc/access/libaccess_udp_plugin.so
- usr/lib/vlc/access/libcdda_plugin.so
- usr/lib/vlc/access/libdvb_plugin.so
- usr/lib/vlc/access/libdvdnav_plugin.so
- usr/lib/vlc/access/libdvdread_plugin.so
- usr/lib/vlc/access/libpvr_plugin.so
- usr/lib/vlc/access/librtp_plugin.so
- usr/lib/vlc/access/libv4l2_plugin.so
- usr/lib/vlc/access/libv4l_plugin.so
- usr/lib/vlc/access/libvcd_plugin.so
- usr/lib/vlc/access/libvcdx_plugin.so
- usr/lib/vlc/access/libzip_plugin.so
- usr/lib/vlc/access_output
- usr/lib/vlc/audio_filter
- usr/lib/vlc/audio_mixer
- usr/lib/vlc/audio_output/libalsa_plugin.so
- usr/lib/vlc/audio_output/libaout_file_plugin.so
- usr/lib/vlc/audio_output/liboss_plugin.so
- usr/lib/vlc/codec/liba52_plugin.so
- usr/lib/vlc/codec/libadpcm_plugin.so
- usr/lib/vlc/codec/libaes3_plugin.so
- usr/lib/vlc/codec/libaraw_plugin.so
- usr/lib/vlc/codec/libavcodec_plugin.so
- usr/lib/vlc/codec/libcc_plugin.so
- usr/lib/vlc/codec/libcdg_plugin.so
- usr/lib/vlc/codec/libcmml_plugin.so
- usr/lib/vlc/codec/libcvdsub_plugin.so
- usr/lib/vlc/codec/libdts_plugin.so
- usr/lib/vlc/codec/libdvbsub_plugin.so
- usr/lib/vlc/codec/libfaad_plugin.so
- usr/lib/vlc/codec/libfake_plugin.so
- usr/lib/vlc/codec/libflac_plugin.so
- usr/lib/vlc/codec/libinvmem_plugin.so
- usr/lib/vlc/codec/liblibass_plugin.so
- usr/lib/vlc/codec/liblibmpeg2_plugin.so
- usr/lib/vlc/codec/liblpcm_plugin.so
- usr/lib/vlc/codec/libmpeg_audio_plugin.so
- usr/lib/vlc/codec/libpng_plugin.so
- usr/lib/vlc/codec/librawvideo_plugin.so
- usr/lib/vlc/codec/libschroedinger_plugin.so
- usr/lib/vlc/codec/libspeex_plugin.so
- usr/lib/vlc/codec/libspudec_plugin.so
- usr/lib/vlc/codec/libsubsdec_plugin.so
- usr/lib/vlc/codec/libsubsusf_plugin.so
- usr/lib/vlc/codec/libsvcdsub_plugin.so
- usr/lib/vlc/codec/libt140_plugin.so
- usr/lib/vlc/codec/libtelx_plugin.so
- usr/lib/vlc/codec/libtheora_plugin.so
- usr/lib/vlc/codec/libtwolame_plugin.so
- usr/lib/vlc/codec/libvorbis_plugin.so
- usr/lib/vlc/codec/libx264_plugin.so
- usr/lib/vlc/control/libdbus_plugin.so
- usr/lib/vlc/control/libgestures_plugin.so
- usr/lib/vlc/control/libhotkeys_plugin.so
- usr/lib/vlc/control/libhttp_plugin.so
- usr/lib/vlc/control/liblirc_plugin.so
- usr/lib/vlc/control/libmotion_plugin.so
- usr/lib/vlc/control/librc_plugin.so
- usr/lib/vlc/control/libshowintf_plugin.so
- usr/lib/vlc/control/libsignals_plugin.so
- usr/lib/vlc/control/libtelnet_plugin.so
- usr/lib/vlc/demux
- usr/lib/vlc/gui/libncurses_plugin.so
- usr/lib/vlc/meta_engine
- usr/lib/vlc/misc/libaudioscrobbler_plugin.so
- usr/lib/vlc/misc/libdummy_plugin.so
- usr/lib/vlc/misc/libexport_plugin.so
- usr/lib/vlc/misc/libfreetype_plugin.so
- usr/lib/vlc/misc/libgnutls_plugin.so
- usr/lib/vlc/misc/libinhibit_plugin.so
- usr/lib/vlc/misc/liblogger_plugin.so
- usr/lib/vlc/misc/liblua_plugin.so
- usr/lib/vlc/misc/libmemcpy*_plugin.so
- usr/lib/vlc/misc/libosd_parser_plugin.so
- usr/lib/vlc/misc/libprobe_hal_plugin.so
- usr/lib/vlc/misc/libstats_plugin.so
- usr/lib/vlc/misc/libtelepathy_plugin.so
- usr/lib/vlc/misc/libvod_rtsp_plugin.so
- usr/lib/vlc/misc/libxml_plugin.so
- usr/lib/vlc/misc/libxtag_plugin.so
- usr/lib/vlc/mux
- usr/lib/vlc/packetizer
- usr/lib/vlc/services_discovery
- usr/lib/vlc/stream_filter
- usr/lib/vlc/stream_out
- usr/lib/vlc/video_chroma
- usr/lib/vlc/video_filter/libadjust_plugin.so
- usr/lib/vlc/video_filter/libalphamask_plugin.so
- usr/lib/vlc/video_filter/libblend_plugin.so
- usr/lib/vlc/video_filter/libblendbench_plugin.so
- usr/lib/vlc/video_filter/libbluescreen_plugin.so
- usr/lib/vlc/video_filter/libcanvas_plugin.so
- usr/lib/vlc/video_filter/libchain_plugin.so
- usr/lib/vlc/video_filter/libclone_plugin.so
- usr/lib/vlc/video_filter/libcolorthres_plugin.so
- usr/lib/vlc/video_filter/libcrop_plugin.so
- usr/lib/vlc/video_filter/libcroppadd_plugin.so
- usr/lib/vlc/video_filter/libdeinterlace_plugin.so
- usr/lib/vlc/video_filter/libdynamicoverlay_plugin.so
- usr/lib/vlc/video_filter/liberase_plugin.so
- usr/lib/vlc/video_filter/libextract_plugin.so
- usr/lib/vlc/video_filter/libgaussianblur_plugin.so
- usr/lib/vlc/video_filter/libgradient_plugin.so
- usr/lib/vlc/video_filter/libgrain_plugin.so
- usr/lib/vlc/video_filter/libinvert_plugin.so
- usr/lib/vlc/video_filter/liblogo_plugin.so
- usr/lib/vlc/video_filter/libmagnify_plugin.so
- usr/lib/vlc/video_filter/libmarq_plugin.so
- usr/lib/vlc/video_filter/libmosaic_plugin.so
- usr/lib/vlc/video_filter/libmotionblur_plugin.so
- usr/lib/vlc/video_filter/libmotiondetect_plugin.so
- usr/lib/vlc/video_filter/libnoise_plugin.so
- usr/lib/vlc/video_filter/libosdmenu_plugin.so
- usr/lib/vlc/video_filter/libpostproc_plugin.so
- usr/lib/vlc/video_filter/libpsychedelic_plugin.so
- usr/lib/vlc/video_filter/libpuzzle_plugin.so
- usr/lib/vlc/video_filter/libremoteosd_plugin.so
- usr/lib/vlc/video_filter/libripple_plugin.so
- usr/lib/vlc/video_filter/librotate_plugin.so
- usr/lib/vlc/video_filter/librss_plugin.so
- usr/lib/vlc/video_filter/librv32_plugin.so
- usr/lib/vlc/video_filter/libscale_plugin.so
- usr/lib/vlc/video_filter/libscene_plugin.so
- usr/lib/vlc/video_filter/libsharpen_plugin.so
- usr/lib/vlc/video_filter/libswscale_plugin.so
- usr/lib/vlc/video_filter/libtransform_plugin.so
- usr/lib/vlc/video_filter/libwall_plugin.so
- usr/lib/vlc/video_filter/libwave_plugin.so
- usr/lib/vlc/video_filter/libyuvp_plugin.so
- usr/lib/vlc/video_output/libcaca_plugin.so
- usr/lib/vlc/video_output/libfb_plugin.so
- usr/lib/vlc/video_output/libvmem_plugin.so
- usr/lib/vlc/video_output/libyuv_plugin.so
- usr/lib/vlc/visualization/libvisual_plugin.so
+ usr/lib/vlc/lua/
+ usr/lib/vlc/plugins/access/libaccess_alsa_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_attachment_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_avio_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_bd_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_dv_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_fake_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_ftp_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_http_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_imem_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_mmap_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_mms_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_mtp_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_oss_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_smb_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_tcp_plugin.so
+ usr/lib/vlc/plugins/access/libaccess_udp_plugin.so
+ usr/lib/vlc/plugins/access/libcdda_plugin.so
+ usr/lib/vlc/plugins/access/libdc1394_plugin.so
+ usr/lib/vlc/plugins/access/libdvb_plugin.so
+ usr/lib/vlc/plugins/access/libdvdnav_plugin.so
+ usr/lib/vlc/plugins/access/libdvdread_plugin.so
+ usr/lib/vlc/plugins/access/libfilesystem_plugin.so
+ usr/lib/vlc/plugins/access/libpvr_plugin.so
+ usr/lib/vlc/plugins/access/librtp_plugin.so
+ usr/lib/vlc/plugins/access/libv4l2_plugin.so
+ usr/lib/vlc/plugins/access/libv4l_plugin.so
+ usr/lib/vlc/plugins/access/libvcd_plugin.so
+ usr/lib/vlc/plugins/access/libvcdx_plugin.so
+ usr/lib/vlc/plugins/access/libzip_plugin.so
+ usr/lib/vlc/plugins/access_output
+ usr/lib/vlc/plugins/audio_filter
+ usr/lib/vlc/plugins/audio_mixer
+ usr/lib/vlc/plugins/audio_output/libalsa_plugin.so
+ usr/lib/vlc/plugins/audio_output/libaout_file_plugin.so
+ usr/lib/vlc/plugins/audio_output/liboss_plugin.so
+ usr/lib/vlc/plugins/codec/liba52_plugin.so
+ usr/lib/vlc/plugins/codec/libadpcm_plugin.so
+ usr/lib/vlc/plugins/codec/libaes3_plugin.so
+ usr/lib/vlc/plugins/codec/libaraw_plugin.so
+ usr/lib/vlc/plugins/codec/libavcodec_plugin.so
+ usr/lib/vlc/plugins/codec/libcc_plugin.so
+ usr/lib/vlc/plugins/codec/libcdg_plugin.so
+ usr/lib/vlc/plugins/codec/libcvdsub_plugin.so
+ usr/lib/vlc/plugins/codec/libdirac_plugin.so
+ usr/lib/vlc/plugins/codec/libdts_plugin.so
+ usr/lib/vlc/plugins/codec/libdvbsub_plugin.so
+ usr/lib/vlc/plugins/codec/libfaad_plugin.so
+ usr/lib/vlc/plugins/codec/libfake_plugin.so
+ usr/lib/vlc/plugins/codec/libflac_plugin.so
+ usr/lib/vlc/plugins/codec/libinvmem_plugin.so
+ usr/lib/vlc/plugins/codec/libkate_plugin.so
+ usr/lib/vlc/plugins/codec/liblibass_plugin.so
+ usr/lib/vlc/plugins/codec/liblibmpeg2_plugin.so
+ usr/lib/vlc/plugins/codec/liblpcm_plugin.so
+ usr/lib/vlc/plugins/codec/libmpeg_audio_plugin.so
+ usr/lib/vlc/plugins/codec/libpng_plugin.so
+ usr/lib/vlc/plugins/codec/librawvideo_plugin.so
+ usr/lib/vlc/plugins/codec/libschroedinger_plugin.so
+ usr/lib/vlc/plugins/codec/libspeex_plugin.so
+ usr/lib/vlc/plugins/codec/libspudec_plugin.so
+ usr/lib/vlc/plugins/codec/libsubsdec_plugin.so
+ usr/lib/vlc/plugins/codec/libsubsusf_plugin.so
+ usr/lib/vlc/plugins/codec/libsvcdsub_plugin.so
+ usr/lib/vlc/plugins/codec/libt140_plugin.so
+ usr/lib/vlc/plugins/codec/libtheora_plugin.so
+ usr/lib/vlc/plugins/codec/libtwolame_plugin.so
+ usr/lib/vlc/plugins/codec/libvorbis_plugin.so
+ usr/lib/vlc/plugins/control/libdbus_plugin.so
+ usr/lib/vlc/plugins/control/libgestures_plugin.so
+ usr/lib/vlc/plugins/control/libhotkeys_plugin.so
+ usr/lib/vlc/plugins/control/liblirc_plugin.so
+ usr/lib/vlc/plugins/control/libmotion_plugin.so
+ usr/lib/vlc/plugins/control/libnetsync_plugin.so
+ usr/lib/vlc/plugins/control/liboldhttp_plugin.so
+ usr/lib/vlc/plugins/control/liboldrc_plugin.so
+ usr/lib/vlc/plugins/control/liboldtelnet_plugin.so
+ usr/lib/vlc/plugins/control/libsignals_plugin.so
+ usr/lib/vlc/plugins/demux
+ usr/lib/vlc/plugins/gui/libncurses_plugin.so
+ usr/lib/vlc/plugins/meta_engine
+ usr/lib/vlc/plugins/misc/libaudioscrobbler_plugin.so
+ usr/lib/vlc/plugins/misc/libdummy_plugin.so
+ usr/lib/vlc/plugins/misc/libexport_plugin.so
+ usr/lib/vlc/plugins/misc/libfreetype_plugin.so
+ usr/lib/vlc/plugins/misc/libgnutls_plugin.so
+ usr/lib/vlc/plugins/misc/libinhibit_plugin.so
+ usr/lib/vlc/plugins/misc/liblogger_plugin.so
+ usr/lib/vlc/plugins/misc/liblua_plugin.so
+ usr/lib/vlc/plugins/misc/libosd_parser_plugin.so
+ usr/lib/vlc/plugins/misc/libstats_plugin.so
+ usr/lib/vlc/plugins/misc/libtelepathy_plugin.so
+ usr/lib/vlc/plugins/misc/libvod_rtsp_plugin.so
+ usr/lib/vlc/plugins/misc/libxml_plugin.so
+ usr/lib/vlc/plugins/misc/libxtag_plugin.so
+ usr/lib/vlc/plugins/mux
+ usr/lib/vlc/plugins/packetizer
+ usr/lib/vlc/plugins/services_discovery
+ usr/lib/vlc/plugins/stream_filter
+ usr/lib/vlc/plugins/stream_out
+ usr/lib/vlc/plugins/video_chroma
+ usr/lib/vlc/plugins/video_filter/libadjust_plugin.so
+ usr/lib/vlc/plugins/video_filter/libalphamask_plugin.so
+ usr/lib/vlc/plugins/video_filter/libatmo_plugin.so
+ usr/lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
+ usr/lib/vlc/plugins/video_filter/libball_plugin.so
+ usr/lib/vlc/plugins/video_filter/libblend_plugin.so
+ usr/lib/vlc/plugins/video_filter/libblendbench_plugin.so
+ usr/lib/vlc/plugins/video_filter/libbluescreen_plugin.so
+ usr/lib/vlc/plugins/video_filter/libcanvas_plugin.so
+ usr/lib/vlc/plugins/video_filter/libchain_plugin.so
+ usr/lib/vlc/plugins/video_filter/libclone_plugin.so
+ usr/lib/vlc/plugins/video_filter/libcolorthres_plugin.so
+ usr/lib/vlc/plugins/video_filter/libcrop_plugin.so
+ usr/lib/vlc/plugins/video_filter/libcroppadd_plugin.so
+ usr/lib/vlc/plugins/video_filter/libdeinterlace_plugin.so
+ usr/lib/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
+ usr/lib/vlc/plugins/video_filter/liberase_plugin.so
+ usr/lib/vlc/plugins/video_filter/libextract_plugin.so
+ usr/lib/vlc/plugins/video_filter/libgaussianblur_plugin.so
+ usr/lib/vlc/plugins/video_filter/libgradient_plugin.so
+ usr/lib/vlc/plugins/video_filter/libgrain_plugin.so
+ usr/lib/vlc/plugins/video_filter/libinvert_plugin.so
+ usr/lib/vlc/plugins/video_filter/liblogo_plugin.so
+ usr/lib/vlc/plugins/video_filter/libmagnify_plugin.so
+ usr/lib/vlc/plugins/video_filter/libmarq_plugin.so
+ usr/lib/vlc/plugins/video_filter/libmirror_plugin.so
+ usr/lib/vlc/plugins/video_filter/libmosaic_plugin.so
+ usr/lib/vlc/plugins/video_filter/libmotionblur_plugin.so
+ usr/lib/vlc/plugins/video_filter/libmotiondetect_plugin.so
+ usr/lib/vlc/plugins/video_filter/libnoise_plugin.so
+ usr/lib/vlc/plugins/video_filter/libosdmenu_plugin.so
+ usr/lib/vlc/plugins/video_filter/libpostproc_plugin.so
+ usr/lib/vlc/plugins/video_filter/libpsychedelic_plugin.so
+ usr/lib/vlc/plugins/video_filter/libpuzzle_plugin.so
+ usr/lib/vlc/plugins/video_filter/libremoteosd_plugin.so
+ usr/lib/vlc/plugins/video_filter/libripple_plugin.so
+ usr/lib/vlc/plugins/video_filter/librotate_plugin.so
+ usr/lib/vlc/plugins/video_filter/librss_plugin.so
+ usr/lib/vlc/plugins/video_filter/librv32_plugin.so
+ usr/lib/vlc/plugins/video_filter/libscale_plugin.so
+ usr/lib/vlc/plugins/video_filter/libscene_plugin.so
+ usr/lib/vlc/plugins/video_filter/libsharpen_plugin.so
+ usr/lib/vlc/plugins/video_filter/libswscale_plugin.so
+ usr/lib/vlc/plugins/video_filter/libtransform_plugin.so
+ usr/lib/vlc/plugins/video_filter/libvideo_filter_wrapper_plugin.so
+ usr/lib/vlc/plugins/video_filter/libwall_plugin.so
+ usr/lib/vlc/plugins/video_filter/libwave_plugin.so
+ usr/lib/vlc/plugins/video_filter/libyuvp_plugin.so
+ usr/lib/vlc/plugins/video_output/libcaca_plugin.so
+ usr/lib/vlc/plugins/video_output/libfb_plugin.so
+ usr/lib/vlc/plugins/video_output/libvmem_plugin.so
+ usr/lib/vlc/plugins/video_output/libvout_wrapper_plugin.so
+ usr/lib/vlc/plugins/video_output/libyuv_plugin.so
+ usr/lib/vlc/plugins/visualization/libvisual_plugin.so
+ usr/lib/vlc/vlc-cache-gen
+ usr/share/man
 +debian/source_vlc.py usr/share/apport/package-hooks/

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list