[SCM] VLC media player packaging branch, maverick, updated. debian/1.1.1-1+exp1ubuntu1-22-gd33f703
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Thu Aug 5 01:07:00 UTC 2010
The following commit has been merged in the maverick branch:
commit d33f7039374d419cefc7407a68a59e422be7ef5b
Merge: 38a09d1ab8d63b7978c98a224a8ec1a11fcbb96f ee9532473c0724c3396b183e8d4a709d01be7c93
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Aug 5 03:04:43 2010 +0200
Merge branch 'experimental' into maverick
diff --combined debian/changelog
index 0a25501,6ad4237..50c048a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,33 +1,42 @@@
- vlc (1.1.1-1+exp1ubuntu1) maverick; urgency=low
++vlc (1.1.2-1+exp1ubuntu1) maverick; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ - build and install the libx264 plugin
+ - add Xb-Npp header to vlc package
+ - Add apport hook to include more vlc dependencies in bug reports
+
- -- Benjamin Drung <bdrung at ubuntu.com> Fri, 23 Jul 2010 10:41:59 +0200
++ -- Benjamin Drung <bdrung at ubuntu.com> Thu, 05 Aug 2010 03:04:14 +0200
+
- vlc (1.1.1-1+exp1) experimental; urgency=low
+ vlc (1.1.2-1+exp1) experimental; urgency=low
+ [ Christophe Mutricy ]
* Depends on xulrunner-dev >= 1.9.2
* Activate VA-API (Closes: #587792, LP: #539406)
- -- Christophe Mutricy <xtophe at videolan.org> Thu, 22 Jul 2010 01:31:04 +0200
+ [ Benjamin Drung ]
+ * Switch to dh7.
+ * Move libavcodec plugin from vlc-nox to vlc.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Thu, 05 Aug 2010 01:42:50 +0200
+
+ vlc (1.1.2-1) unstable; urgency=low
+
+ [ Christophe Mutricy ]
+ * New upstream release
+ * Also check for libxcb
+ * Move xcb_apps SD to vlc
+ * Re-enable the modplug module and require the fixed version
+ (Closes: #589890, #590787)
+ * Fix location of icons in vlc.menu (Closes: #590294)
+ thanks to Juhapekka Tolvanen
+ * Split the notify plugin to not depend on GTK+ (Closes: #590504)
+ thanks to Viktar Vauchkevich
+
+ [ Benjamin Drung ]
+ * Add proper Breaks and Replaces to vlc and vlc-plugin-notify.
+ * Bump Standards-Version to 3.9.1 (no changes required).
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Tue, 03 Aug 2010 01:38:17 +0200
vlc (1.1.1-1) unstable; urgency=low
@@@ -26,22 -41,6 +50,22 @@@
-- Christophe Mutricy <xtophe at videolan.org> Thu, 22 Jul 2010 00:36:00 +0200
+vlc (1.1.0-4ubuntu2) maverick; urgency=low
+
+ * No-change rebuild to pick up new j-a-c-k shlibs
+
+ -- Luke Yelavich <themuso at ubuntu.com> Wed, 21 Jul 2010 14:45:26 +0200
+
+vlc (1.1.0-4ubuntu1) maverick; urgency=low
+
+ * Merge from Debian unstable (LP: #606849), remaining changes:
+ - build and install the libx264 plugin
+ - add Xb-Npp header to vlc package
+ - Add apport hook to include more vlc dependencies in bug reports
+ - drop xulrunner 1.9.1 patch (502_xulrunner_191.diff)
+
+ -- Lorenzo De Liso <blackz at ubuntu.com> Sun, 18 Jul 2010 09:45:01 +0200
+
vlc (1.1.0-4) unstable; urgency=low
* also move udev to the list of linux specific features
@@@ -57,16 -56,6 +81,16 @@@ vlc (1.1.0-3) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Fri, 09 Jul 2010 15:18:08 -0400
+vlc (1.1.0-2ubuntu1) maverick; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - build and install the libx264 plugin
+ - add Xb-Npp header to vlc package
+ - Add apport hook to include more vlc dependencies in bug reports
+ - drop xulrunner 1.9.1 patch (502_xulrunner_191.diff)
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Thu, 08 Jul 2010 11:18:06 +0200
+
vlc (1.1.0-2) unstable; urgency=low
* libdc1394 is linux specific.
@@@ -75,17 -64,6 +99,17 @@@
-- Christophe Mutricy <xtophe at videolan.org> Wed, 07 Jul 2010 22:52:17 +0100
+vlc (1.1.0-1ubuntu1) maverick; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - build and install the libx264 plugin
+ - add Xb-Npp header to vlc package
+ - Add apport hook to include more vlc dependencies in bug reports
+ * Drop xulrunner patches.
+ * Drop 502_xulrunner_191.diff.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Fri, 25 Jun 2010 01:09:16 +0200
+
vlc (1.1.0-1) unstable; urgency=low
[ Christophe Mutricy ]
@@@ -150,29 -128,6 +174,29 @@@
-- 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
@@@ -184,40 -139,6 +208,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 ]
@@@ -233,14 -154,6 +257,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
@@@ -263,20 -176,6 +287,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
@@@ -289,14 -188,6 +313,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
@@@ -328,31 -219,6 +352,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
@@@ -369,22 -235,6 +393,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
@@@ -400,17 -250,6 +424,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
@@@ -424,22 -263,6 +448,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
@@@ -457,16 -280,6 +481,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
@@@ -487,17 -300,6 +511,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
@@@ -544,36 -346,6 +568,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
@@@ -583,29 -355,6 +607,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
@@@ -657,50 -406,6 +681,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
@@@ -711,20 -416,6 +735,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 ]
@@@ -754,38 -445,6 +778,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
@@@ -810,70 -469,6 +834,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 5f667c8,1b9c438..7715ba7
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
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>,
@@@ -45,6 -44,7 +45,7 @@@ Build-Depends: debhelper (>= 7.2.3~)
liblua5.1-0-dev,
libmad0-dev,
libmatroska-dev (>= 0.8.0),
+ libmodplug-dev (>= 1:0.8.8.1),
libmpcdec-dev,
libmpeg2-4-dev,
libmtp-dev,
@@@ -73,12 -73,11 +74,12 @@@
libudev-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libupnp3-dev,
libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libva-dev,
+ libva-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libvcdinfo-dev,
libvorbis-dev,
libx11-dev,
libx11-xcb-dev,
+ libx264-dev,
libxcb1-dev,
libxcb-keysyms1-dev,
libxcb-randr0-dev,
@@@ -95,7 -94,7 +96,7 @@@
xulrunner-dev (>= 1.9.2),
yasm [amd64 kfreebsd-amd64],
zlib1g-dev
- Standards-Version: 3.9.0
+ Standards-Version: 3.9.1
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=summary
@@@ -163,37 -162,6 +164,37 @@@ 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
@@@ -211,10 -179,12 +212,12 @@@ Depends: ttf-dejavu-core
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
- Recommends: vlc-plugin-pulse (= ${binary:Version})
+ Recommends: vlc-plugin-notify (= ${binary:Version}),
+ vlc-plugin-pulse (= ${binary:Version})
Suggests: mozilla-plugin-vlc,
videolan-doc
- Replaces: vlc-nox (<< 1.0.4-2)
+ Breaks: vlc-nox (<< 1.1.2-1+exp1)
+ Replaces: vlc-nox (<< 1.1.2-1+exp1)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@@ -262,7 -232,7 +265,7 @@@ Package: vlc-no
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,
@@@ -322,6 -292,21 +325,21 @@@ Description: Jack audio plugins for VL
select the `jack' audio output plugin from the preferences menu.
For the jack input, use `vlc jack://channels=...:ports=...'
.
+ 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-notify
+ Architecture: any
+ Depends: vlc-nox (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+ Breaks: vlc-nox (<< 1.1.2)
+ Replaces: vlc-nox (<< 1.1.2)
+ Description: LibNotify plugin for VLC
+ This plugin adds support for libnotify track change notification 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.
diff --combined debian/gbp.conf
index 66e9e98,a005699..18bfd8a
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,7 +1,7 @@@
[DEFAULT]
-debian-branch = experimental
+debian-branch = maverick
pristine-tar = True
compression = bzip2
+
+ [git-dch]
+ meta = True
diff --combined debian/rules
index 3a18607,5eb9bbe..7808000
--- a/debian/rules
+++ b/debian/rules
@@@ -16,16 -16,6 +16,6 @@@ endi
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
confflags += --disable-optimizations --disable-mmx --disable-sse --disable-altivec
endif
- ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
- else
- # on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS
- ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
- NUMJOBS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
- MAKEFLAGS += -j$(NUMJOBS)
- endif
- endif
LDFLAGS = -Wl,--as-needed
@@@ -63,7 -53,6 +53,6 @@@ confflags +=
--enable-libass \
--enable-libmpeg2 \
--enable-libproxy \
- --enable-libva \
--enable-libxml2 \
--enable-lirc \
--enable-live555 \
@@@ -94,7 -83,6 +83,7 @@@
--enable-vcd \
--enable-vcdx \
--enable-vorbis \
+ --enable-x264 \
--enable-zvbi \
--with-kde-solid=/usr/share/kde4/apps/ \
--with-mozilla-pkg=libxul \
@@@ -103,22 -91,22 +92,20 @@@
# dxva2 -> Windows only
# gnomevfs -> poorly maintained
# goom -> not in Debian
- # modplug -> http://bugs.debian.org/588465
# 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-mod \
--disable-osso_screensaver \
--disable-portaudio \
--disable-projectm \
--disable-sqlite \
--disable-telx \
- --disable-x264 \
$(NULL)
# Linux specific flags
@@@ -128,6 -116,7 +115,7 @@@ confflags +=
--enable-atmo \
--enable-dc1394 \
--enable-dv \
+ --enable-libva \
--enable-pvr \
--enable-udev \
--enable-v4l \
@@@ -146,9 -135,18 +134,18 @@@ ifneq ($(filter $(DEB_HOST_ARCH), amd6
confflags += --enable-svgalib
endif
- build: build-stamp
- build-stamp:
- dh_testdir
+ %:
+ dh $@ --parallel
+
+ override_dh_auto_clean:
+ [ ! -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
+ rm -rf tmp/
+ dh_auto_clean
+
+ override_dh_auto_configure:
# We need to build the static library apart
# Else it's a mess when we build the modules
./configure --enable-static $(confflags)
@@@ -157,8 -155,9 +154,9 @@@
mkdir -p tmp
cp src/.libs/libvlccore.a tmp/libvlccore.a
cp src/.libs/libvlc.a tmp/libvlc.a
- ./configure $(confflags)
- $(MAKE)
+ dh_auto_configure -- $(confflags)
+
+ override_dh_auto_test:
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
# Check which plugins were built and whether they load properly.
@@@ -171,36 -170,16 +169,16 @@@
fi
endif
endif
- touch $@
-
- 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/
- 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/
+ override_dh_install:
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\|atmo\|dc1394\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
+ # Remove some modules on non-linux arch
+ sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\|udev\)_/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
@@@ -213,67 -192,40 +191,40 @@@
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
+ dh_install --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
-
-
+ if test -d debian/vlc-data; then \
+ 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; \
+ fi
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- # Check that we did not install a plugin linked with libX11 in vlc-nox
+ # Check that we did not install a plugin linked with libX11 or
+ # libxcb in vlc-nox
BORKED=no; \
for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
- if objdump -x $$file | egrep -q '^ +NEEDED +libX11\.so'; then \
+ if objdump -x $$file | egrep -q -e '^ +NEEDED +libX11\.so' \
+ -e '^ +NEEDED +libxcb\.so'; then \
BORKED=yes; \
- echo $$file depends on libX11; \
+ echo $$file depends on libX11 or libxcb; \
fi; \
done; \
if test "$$BORKED" = yes; then exit 1; fi
endif
+ dh_buildinfo -p vlc-nox
- # Build architecture-independent files here.
- binary-indep: build install
- dh_testdir
- dh_testroot
- dh_link -i
- dh_installdocs -p vlc-data
- dh_installchangelogs ChangeLog -p vlc-data
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+ override_dh_strip:
+ dh_strip --dbg-package=vlc-dbg
- # Build architecture-dependent files here.
- binary-arch: build install
- dh_testdir
- dh_testroot
+ override_dh_installdocs:
dh_installdocs -p vlc
+ dh_installdocs -p vlc-data
dh_installdocs -p vlc-nox
- dh_link -s
- dh_buildinfo -p vlc-nox
- dh_installmenu -s
- dh_installmime -s
- dh_installman -s
+
+ override_dh_installchangelogs:
dh_installchangelogs ChangeLog -p vlc
+ dh_installchangelogs ChangeLog -p vlc-data
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 -plibvlc5
- dh_makeshlibs -plibvlccore4
- dh_installdeb -s
- dh_shlibdeps -s -ldebian/libvlc5/usr/lib:debian/libvlccore4/usr/lib
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
-
- binary: binary-indep binary-arch
- .PHONY: build clean install binary-indep binary-arch binary
diff --combined debian/vlc-nox.install
index 7e62e41,38ddd70..79f0d17
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@@ -44,7 -44,6 +44,6 @@@ usr/lib/vlc/plugins/codec/liba52_plugin
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
@@@ -72,7 -71,6 +71,7 @@@ usr/lib/vlc/plugins/codec/libt140_plugi
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/codec/libx264_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
@@@ -102,7 -100,13 +101,13 @@@ usr/lib/vlc/plugins/misc/libxml_plugin.
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/services_discovery/libsap_plugin.so
+ usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
+ usr/lib/vlc/plugins/services_discovery/libupnp_intel_plugin.so
+ usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
+ usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
+ usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
+ usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
usr/lib/vlc/plugins/stream_filter
usr/lib/vlc/plugins/stream_out
usr/lib/vlc/plugins/video_chroma
@@@ -162,4 -166,3 +167,4 @@@ usr/lib/vlc/plugins/video_output/libyuv
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