[SCM] vlc/ubuntu: Merge branch 'master' into ubuntu
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Tue Jan 25 00:36:47 UTC 2011
Release 1.1.6-1 to Debian experimental.
Mention CVE in changelog
Revert "Add backported notify GTK+ dependency patch."
Update debian/changelog.
Add backported notify GTK+ dependency patch.
Build depends on libgtk2.0-dev for notify module.
Add lirc build failure fix patch.
Rename .diff to .patch.
Update debian/changelog.
Drop backported patches.
Merge commit 'upstream/1.1.6'
Imported Upstream version 1.1.6
wrap-and-sort
Drop DM-Upload-Allowed.
Update my email address.
Tighten more build dependencies after reviewing configure.ac.
Tighten some build dependencies (Closes: #605638)
wrap-and-sort --sort-binary-packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 4207ea5d1ffe75d124ea4cb96a1bf7ad6c8300e1
X-Git-Newrev: 49436c197bf5ef7eda86892511c6e3cb65003eb8
The following commit has been merged in the ubuntu branch:
commit c5105fb93d9826fa5795cbc3555a5cee566fd1ed
Merge: 4207ea5d1ffe75d124ea4cb96a1bf7ad6c8300e1 ac44eef6ad3803f2e46260bcae1e4914b941378e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Jan 25 01:22:22 2011 +0100
Merge branch 'master' into ubuntu
diff --combined debian/changelog
index e07a014,19e2f5e..d4a9885
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,28 +1,42 @@@
+ vlc (1.1.6-1) experimental; urgency=low
+
+ [ Reinhard Tartler ]
+ * Tighten some build dependencies (Closes: #605638)
+
+ [ Benjamin Drung ]
+ * New upstream release.
+ - Fix heap buffer overflow in Real demuxer (CVE-2010-3907) (LP: #690173)
+ - Fix blue face issue with X11 ouput (LP: #665298)
+ - Fix crash with SIGSEGV in QMetaObject::activate() (LP: #448082)
+ - Fix heap overflow in CDG decoder and XML heap corruption (LP: #707154)
+ * Drop backported patches.
+ * Tighten more build dependencies after reviewing configure.ac.
+ * Update my email address.
+ * Add lirc build failure fix patch.
+ * Build depends on libgtk2.0-dev for notify module.
+
+ -- Benjamin Drung <bdrung at debian.org> Mon, 24 Jan 2011 23:16:54 +0100
+
+vlc (1.1.5-3ubuntu1) natty; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Fri, 26 Nov 2010 00:51:45 +0100
+
vlc (1.1.5-3) experimental; urgency=low
* Apply upstream fix for KDE device actions. (LP: #542293)
-- Benjamin Drung <bdrung at ubuntu.com> Fri, 26 Nov 2010 00:26:15 +0100
+vlc (1.1.5-2ubuntu1) natty; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Wed, 24 Nov 2010 00:51:28 +0100
+
vlc (1.1.5-2) experimental; urgency=low
[ Reinhard Tartler ]
@@@ -30,19 -35,6 +49,19 @@@
-- Benjamin Drung <bdrung at ubuntu.com> Wed, 24 Nov 2010 00:19:39 +0100
+vlc (1.1.5-1ubuntu2) natty; urgency=low
+
+ * Fixed wrong aspect ratio in transcoded image from webcam. (LP: #672304)
+
+ -- Nicola Ferralis <feranick at hotmail.com> Fri, 19 Nov 2010 00:15:09 +0100
+
+vlc (1.1.5-1ubuntu1) natty; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sun, 14 Nov 2010 22:11:19 +0100
+
vlc (1.1.5-1) experimental; urgency=low
* New upstream release.
@@@ -55,13 -47,6 +74,13 @@@
-- Benjamin Drung <bdrung at ubuntu.com> Sun, 14 Nov 2010 21:27:56 +0100
+vlc (1.1.4-1ubuntu1) maverick; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Sun, 05 Sep 2010 02:42:37 +0200
+
vlc (1.1.4-1) experimental; urgency=low
[ Christophe Mutricy ]
@@@ -73,13 -58,6 +92,13 @@@
-- Benjamin Drung <bdrung at ubuntu.com> Sun, 05 Sep 2010 01:47:07 +0200
+vlc (1.1.3-2ubuntu1) maverick; urgency=low
+
+ * Merge from Debian experimental, remaining changes:
+ - build and install the libx264 plugin
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Thu, 19 Aug 2010 23:16:03 +0200
+
vlc (1.1.3-2) experimental; urgency=low
[ Christophe Mutricy ]
@@@ -147,22 -125,6 +166,22 @@@ vlc (1.1.1-1) unstable; urgency=lo
-- 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
@@@ -178,16 -140,6 +197,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.
@@@ -196,17 -148,6 +215,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 ]
@@@ -271,29 -212,6 +290,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
@@@ -305,40 -223,6 +324,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 ]
@@@ -354,14 -238,6 +373,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
@@@ -384,20 -260,6 +403,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
@@@ -410,14 -272,6 +429,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
@@@ -449,31 -303,6 +468,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
@@@ -490,22 -319,6 +509,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
@@@ -521,17 -334,6 +540,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
@@@ -545,22 -347,6 +564,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
@@@ -578,16 -364,6 +597,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
@@@ -608,17 -384,6 +627,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
@@@ -665,36 -430,6 +684,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
@@@ -704,29 -439,6 +723,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
@@@ -778,50 -490,6 +797,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
@@@ -832,20 -500,6 +851,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 ]
@@@ -875,38 -529,6 +894,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
@@@ -931,70 -553,6 +950,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 4819848,819651d..9e201b3
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,28 +1,29 @@@
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>,
- Benjamin Drung <bdrung at ubuntu.com>
- DM-Upload-Allowed: yes
+ Benjamin Drung <bdrung at debian.org>
Build-Depends: debhelper (>= 7.2.3~),
dh-buildinfo,
gettext,
liba52-0.7.4-dev,
libaa1-dev,
libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libass-dev (>= 0.9.5-2),
+ libass-dev (>= 0.9.6),
libavahi-client-dev,
libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libavcodec-dev (>= 4:0.6),
libavformat-dev (>= 4:0.6),
libcaca-dev (>= 0.99.beta4),
libcddb2-dev,
- libcdio-dev,
- libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libcdio-dev (>= 0.78.2),
+ libdc1394-22-dev (>= 2.1.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdca-dev,
libdirac-dev,
libdvbpsi-dev | libdvbpsi5-dev,
@@@ -38,9 -36,10 +37,10 @@@
libggi2-dev,
libgl1-mesa-dev,
libglib2.0-0,
- libgnutls-dev (>= 1.2.8),
+ libgnutls-dev (>= 1.7.4),
+ libgtk2.0-dev,
libjack-dev,
- libkate-dev,
+ libkate-dev (>= 0.1.5),
liblircclient-dev,
liblivemedia-dev (>= 2009.11.27),
liblua5.1-0-dev,
@@@ -49,26 -48,26 +49,26 @@@
libmodplug-dev (>= 1:0.8.8.1),
libmpcdec-dev,
libmpeg2-4-dev,
- libmtp-dev,
+ libmtp-dev (>= 1.0.0),
libncursesw5-dev,
libnotify-dev,
libogg-dev,
libpng12-dev,
libpostproc-dev (>= 4:0.6),
libproxy-dev,
- libpulse-dev,
- libqt4-dev,
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libpulse-dev (>= 0.9.11),
+ libqt4-dev (>= 4.4.0),
+ libraw1394-dev (>= 2.0.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
librsvg2-dev,
- libschroedinger-dev (>= 1.0.7-1~),
+ libschroedinger-dev (>= 1.0.7),
libsdl-image1.2-dev,
- libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
+ libsdl1.2-dev (>= 1.2.10),
libshout3-dev,
libsmbclient-dev,
libspeex-dev,
libsvga1-dev [amd64 i386],
libswscale-dev (>= 4:0.6),
- libtag1-dev,
+ libtag1-dev (>= 1.5),
libtar-dev,
libtheora-dev,
libtwolame-dev (>= 0.3.8),
@@@ -76,21 -75,20 +76,21 @@@
libupnp3-dev,
libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libva-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libvcdinfo-dev,
+ libvcdinfo-dev (>= 0.7.22),
libvorbis-dev,
libx11-dev,
libx11-xcb-dev,
+ libx264-dev (>= 2:0.76),
- libxcb-keysyms1-dev,
- libxcb-randr0-dev,
+ libxcb-keysyms1-dev (>= 0.3.4),
+ libxcb-randr0-dev (>= 1.3),
libxcb-shm0-dev,
- libxcb-xv0-dev,
+ libxcb-xv0-dev (>= 1.1.90.1),
libxcb1-dev,
libxext-dev,
libxml2-dev,
libxpm-dev,
libxt-dev,
- libzvbi-dev,
+ libzvbi-dev (>= 0.2.28),
lua5.1,
nasm,
pkg-config,
@@@ -102,20 -100,6 +102,6 @@@ 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
- Package: libvlc5
- Section: libs
- Architecture: any
- 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
- 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: libvlc-dev
Section: libdevel
Architecture: any
@@@ -132,14 -116,14 +118,14 @@@ Description: development files for libv
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
- Package: libvlccore4
+ Package: libvlc5
Section: libs
Architecture: any
- 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.
+ 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
+ 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
@@@ -148,9 -132,7 +134,7 @@@
Package: libvlccore-dev
Section: libdevel
Architecture: any
- Depends: libvlccore4 (= ${binary:Version}),
- pkg-config,
- ${misc:Depends}
+ 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.
@@@ -159,12 -141,20 +143,20 @@@
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
+ Package: libvlccore4
+ Section: libs
+ Architecture: any
+ 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: mozilla-plugin-vlc
Architecture: any
- Depends: vlc,
- vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ Depends: vlc, vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Xb-Npp-Applications: 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,
ec8030f7-c20a-464f-9b0e-13a3a9e97384
Xb-Npp-Name: VLC Multimedia Plugin
@@@ -216,8 -206,7 +208,7 @@@ Depends: ttf-freefont
Recommends: vlc-plugin-notify (= ${binary:Version}),
vlc-plugin-pulse (= ${binary:Version}),
xdg-utils
- Suggests: mozilla-plugin-vlc,
- videolan-doc
+ Suggests: mozilla-plugin-vlc, videolan-doc
Breaks: vlc-nox (<< 1.1.5-1)
Replaces: vlc-nox (<< 1.1.5-1)
Provides: mp3-decoder
@@@ -254,8 -243,7 +245,7 @@@ Package: vlc-db
Section: debug
Priority: extra
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends}
+ Depends: vlc-nox (= ${binary:Version}), ${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
@@@ -265,8 -253,7 +255,7 @@@
Package: vlc-nox
Architecture: any
- Depends: ${misc:Depends},
- ${shlibs:Depends}
+ Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: vlc (<< 1.1.0)
Provides: mp3-decoder
Description: multimedia player and streamer (without X support)
@@@ -291,9 -278,7 +280,7 @@@
Package: vlc-plugin-fluidsynth
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ 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.
@@@ -304,9 -289,7 +291,7 @@@
Package: vlc-plugin-ggi
Architecture: any
- Depends: vlc-nox,
- ${misc:Depends},
- ${shlibs:Depends}
+ 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
@@@ -318,9 -301,7 +303,7 @@@
Package: vlc-plugin-jack
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ 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
@@@ -333,9 -314,7 +316,7 @@@
Package: vlc-plugin-notify
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ 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
@@@ -348,9 -327,7 +329,7 @@@
Package: vlc-plugin-pulse
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ Depends: vlc-nox (= ${binary:Version}), ${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
@@@ -362,9 -339,7 +341,7 @@@
Package: vlc-plugin-sdl
Architecture: any
- Depends: vlc-nox,
- ${misc:Depends},
- ${shlibs:Depends}
+ 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
@@@ -377,9 -352,7 +354,7 @@@
Package: vlc-plugin-svg
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ Depends: vlc-nox (= ${binary:Version}), ${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
@@@ -392,9 -365,7 +367,7 @@@
Package: vlc-plugin-svgalib
Architecture: amd64 i386
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ 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
@@@ -407,9 -378,7 +380,7 @@@
Package: vlc-plugin-zvbi
Architecture: any
- Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+ 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 media player packaging
More information about the pkg-multimedia-commits
mailing list