[SCM] VLC media player packaging branch, karmic, updated. debian/1.0.2-1-32-ga6c581f
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Fri Sep 25 13:04:30 UTC 2009
The following commit has been merged in the karmic branch:
commit a6c581f82ee5f68d5c310bf440a411560adc9912
Merge: 9d6ad35e169afa8908a8dd2950219fa2b9662c17 8f597c19edc17ef27e5aa446abf0596580d4ddb8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Sep 25 14:47:02 2009 +0200
Merge branch 'sid' into karmic
diff --combined debian/changelog
index 36e1e8b,e9ed5b1..2eab8cd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,18 +1,39 @@@
++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
+ + Fix some stack overflows in MP4, ASF and AVI demuxers
+ (VideoLAN-SA-0902, CVE pending)(urgency=high)
+ + Closes: #540145, #542108
+ * Fix kfreebsd FTBFS and simplify (Closes: #545863)
+ Thanks to Petr Salinger
+ * Fix Hurd install
+ * Update libvlccore symbol file
+ * Remove libass API patch
+ * Remove uneeded build-deps
+
+ -- 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
@@@ -22,22 -26,6 +47,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
@@@ -55,16 -43,6 +80,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
@@@ -85,17 -63,6 +110,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
@@@ -142,36 -109,6 +167,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
@@@ -181,29 -118,6 +206,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
@@@ -255,50 -169,6 +280,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
@@@ -309,20 -179,6 +334,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 ]
@@@ -352,38 -208,6 +377,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
@@@ -408,70 -232,6 +433,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 ]
@@@ -500,7 -260,7 +525,7 @@@
- vlc-plugin-jack: access_jack
+ Distribute the .pc for libvlc and vlc-plugin (Closes: #289507)
+ Remove wx interface and glide plugin as they've been dropped by upstream
- LP: #205325, #88487, #90603,
+ LP: #205325, #88487, #90603, #150380
+ The Python and java bindings are no longer part of the upstream tarballs
(Closes: #469011)
+ Temporarly disable libdca module until a pkg with the new
diff --combined debian/control
index 23fc544,9f028e9..b966469
--- 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>,
@@@ -14,12 -13,11 +14,11 @@@ Build-Depends: debhelper (>= 7)
quilt,
nasm,
yasm [amd64 kfreebsd-amd64],
- iceape-dev (>= 1.1.9-4),
+ xulrunner-dev,
liba52-0.7.4-dev,
libaa1-dev,
libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libass-dev (>= 0.9.5-2),
- libaudiofile-dev,
libavahi-client-dev,
libavcodec-dev (>= 0.cvs20060823),
libavformat-dev (>= 0.cvs20060823),
@@@ -37,10 -35,8 +36,8 @@@
libgl1-mesa-dev,
libglib2.0-0,
libgnutls-dev (>= 1.2.8),
- libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libhal-dev (>= 0.5.5.1-3) [!hurd-i386],
libid3tag0-dev,
- libidl0,
- libimlib2-dev,
libjack-dev,
liblircclient-dev,
liblivemedia-dev (>= 2008.07.24),
@@@ -74,7 -70,6 +71,7 @@@
libvcdinfo-dev,
libvorbis-dev,
libx11-dev,
+ libx264-dev,
libxext-dev,
libxml2-dev,
libxpm-dev,
@@@ -85,7 -80,7 +82,7 @@@
Standards-Version: 3.8.3
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/sid
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=shortlog;h=refs/heads/karmic
Package: vlc
Architecture: any
@@@ -93,7 -88,6 +90,7 @@@ 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 (<< 0.9.2-1)
@@@ -240,37 -234,6 +237,37 @@@ Description: GGI video output plugin fo
Package: mozilla-plugin-vlc
Architecture: any
Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc: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
diff --combined debian/rules
index 5aa9f55,8ad3573..ee08f9e
--- a/debian/rules
+++ b/debian/rules
@@@ -53,7 -53,7 +53,7 @@@ confflags +=
--enable-aa \
--enable-dvbpsi \
--enable-mozilla \
- --with-mozilla-pkg=iceape-plugin \
+ --with-mozilla-pkg=xulrunner-plugin \
--enable-dvb \
--enable-ogg \
--enable-vorbis \
@@@ -84,7 -84,7 +84,7 @@@
--enable-faad \
--disable-zvbi \
--enable-telx \
- --disable-x264 \
+ --enable-x264 \
--disable-atmo \
--enable-taglib \
--enable-libass \
@@@ -149,6 -149,8 +149,8 @@@ clean
dh_testdir
dh_testroot
rm -f build-stamp
+ rm -f debian/vlc-nox.install.kfreebsd
+ rm -f debian/vlc-nox.install.hurd
# Clean VLC
[ ! -f Makefile ] || $(MAKE) distclean
rm -rf tmp/
@@@ -168,9 -170,9 +170,9 @@@ install: buil
dh_testroot
dh_prep
sed -e '/\(lib\|libaccess_\)\(alsa\|dvb\|v4l\|v4l2\|pvr\)_/d' \
- debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd-i386
- cp debian/vlc-nox.install.kfreebsd-i386 \
- debian/vlc-nox.install.kfreebsd-amd64
+ 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
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list